Merge pull request browsermedia#676 from jamesprior/master

* Specify ruby version in Gemfile instead of a named rvm installation. * Wrap JQuery ready functions to avoid conflicts.

Author: peakpg

.gitignore

@@ -27,4 +27,5 @@ test/dummy/.rvmrc
 test/dummy/public/assets/*
 .sass-cache
 .rvmrc
+.ruby-version 
 db/backups

.ruby-version

@@ -1,5 +1,7 @@
 source 'http://rubygems.org'
 
+ruby '2.0.0'
+
 # Load this project as a gem.
 gemspec
 gem "mysql2"

Gemfile

@@ -113,7 +113,7 @@ jQuery(function($) {
 // .slug-dest - The input field to set the slug value in.
 // @options data-prefix An optional prefix (on slug-dest) that should be added in front of autogenerated slugs
 // (i.e. <input class='slug-dest' data-prefix="/products" />)
-$(function() {
+jQuery(function($){
  if ($('.slug-dest').length && $('.slug-source').length) {
  $('.slug-source').keyup(function() {
  var name = $('.slug-source').val();
@@ -134,14 +134,14 @@ $(function() {
 });
 
 // Automatically enable date_picker controls
-$(function() {
+jQuery(function($){
  if ($.datepicker) {
  $('input.date_picker').datepicker({ changeFirstDay: false, changeMonth: true, changeYear: true, closeText: '', showButtonPanel: true, dateFormat: '<%= Cms::DatePicker.jquery_format %>' });
  }
 });
 
 // UI Enhancement to suggest paths for uploaded files
-$(function() {
+jQuery(function($){
  var path_input = $('.suggest_file_path');
  if (path_input.length) {
  $('select[data-purpose=section_selector], input[data-purpose=cms_file_field]').change(function() {

app/assets/javascripts/cms/core_library.js.erb

@@ -241,7 +241,7 @@ FormBuilder.prototype.setupConfirmationBehavior = function() {
 var formBuilder = new FormBuilder();
 
 // Register FormBuilder handlers on page load.
-$(function() {
+jQuery(function($){
  formBuilder.setup();
 
 

app/assets/javascripts/cms/form_builder.js

@@ -7,11 +7,11 @@
 //= require 'cms/ajax'
 
 // Since we are within the page editing iframe, add a 'target=_top' to all links so they refresh the entire page.
-$(function() {
+jQuery(function($){
  $('a').attr('target', '_top');
 });
 
-$(function() {
+jQuery(function($){
  $.cms_editor = {
  // Returns the widget that a user has currently selected.
  // @return [JQuery.Element]
@@ -123,7 +123,7 @@ $(function() {
 });
 
 // On Ready
-$(function() {
+jQuery(function($){
 
  // Click the 'Add Content' button (PLUS) when editing content.
  $('.cms-add-content').click(function() {

app/assets/javascripts/cms/page_editor.js

@@ -138,7 +138,7 @@ Sitemap.prototype.updateDepth = function(element, newDepth) {
 var sitemap = new Sitemap();
 
 // Enable dragging of items around the sitemap.
-$(function() {
+jQuery(function($){
  if ($('#sitemap').exists()) {
 
  $('#sitemap .draggable').draggable({
@@ -188,7 +188,7 @@ $(function() {
 });
 
 // Open/close folders when rows are clicked.
-$(function() {
+jQuery(function($){
  // Ensure this only loads on sitemap page.
  if ($('#sitemap').exists()) {
  sitemap.restoreOpenState();
@@ -201,7 +201,7 @@ $(function() {
 });
 
 // Make Sitemap filters show specific content types.
-$(function() {
+jQuery(function($){
  $('#sitemap li[data-nodetype]').hide();
  $('#filtershow').change(function() {
  $('#sitemap li[data-nodetype]').slideUp();

app/assets/javascripts/cms/sitemap.js

@@ -26,7 +26,7 @@ Cms.User.current = function(handler) {
 };
 
 // Default Handler for login portlet. Hide the form, show 'Hello $first_name'
-$(function() {
+jQuery(function($){
  if ($('.login-portlet').exists()) {
  Cms.User.current({
  authenticated: function(user) {