Merge pull request #6944 from AugierLe42e/bump-jquery-2

Bump to jQuery 2

Gemfile

@@ -96,7 +96,7 @@ gem "js_image_paths",    "0.1.0"
 gem "js-routes",         "1.2.6"
 
 source "https://rails-assets.org" do
-  gem "rails-assets-jquery",                              "1.12.0" # Should be kept in sync with jquery-rails
+  gem "rails-assets-jquery",                              "2.2.1" # Should be kept in sync with jquery-rails
 
   gem "rails-assets-markdown-it",                         "6.0.5"
   gem "rails-assets-markdown-it-hashtag",                 "0.4.0"

Gemfile.lock

@@ -660,7 +660,7 @@ GEM
     rails-assets-jasmine (2.4.1)
     rails-assets-jasmine-ajax (3.2.0)
       rails-assets-jasmine (~> 2)
-    rails-assets-jquery (1.12.0)
+    rails-assets-jquery (2.2.1)
     rails-assets-jquery-colorbox (1.6.4)
       rails-assets-jquery (>= 1.3.2)
     rails-assets-jquery-fullscreen-plugin (0.5.0)
@@ -1000,7 +1000,7 @@ DEPENDENCIES
   rails-assets-diaspora_jsxc (= 0.1.5.develop.1)!
   rails-assets-highlightjs (= 9.4.0)!
   rails-assets-jasmine-ajax (= 3.2.0)!
-  rails-assets-jquery (= 1.12.0)!
+  rails-assets-jquery (= 2.2.1)!
   rails-assets-jquery-placeholder (= 2.3.1)!
   rails-assets-jquery-textchange (= 0.2.3)!
   rails-assets-markdown-it (= 6.0.5)!

app/assets/javascripts/app/views/publisher_view.js

@@ -475,8 +475,8 @@ app.views.Publisher = Backbone.View.extend({
 
   setButtonsEnabled: function(bool) {
     if (bool) {
-      this.submitEl.removeProp("disabled");
-      this.previewEl.removeProp("disabled");
+      this.submitEl.removeAttr("disabled");
+      this.previewEl.removeAttr("disabled");
     } else {
       this.submitEl.prop("disabled", true);
       this.previewEl.prop("disabled", true);
@@ -485,8 +485,8 @@ app.views.Publisher = Backbone.View.extend({
 
   setInputEnabled: function(bool) {
     if (bool) {
-      this.inputEl.removeProp("disabled");
-      this.hiddenInputEl.removeProp("disabled");
+      this.inputEl.removeAttr("disabled");
+      this.hiddenInputEl.removeAttr("disabled");
     } else {
       this.inputEl.prop("disabled", true);
       this.hiddenInputEl.prop("disabled", true);

app/assets/javascripts/jasmine-load-all.js

@@ -1,4 +1,4 @@
-//= require jquery
+//= require jquery2
 //= require handlebars.runtime
 //= require templates
 //= require main

app/helpers/application_helper.rb

@@ -52,11 +52,11 @@ module ApplicationHelper
   def jquery_include_tag
     buf = []
     if AppConfig.privacy.jquery_cdn?
-      version = Jquery::Rails::JQUERY_VERSION
+      version = Jquery::Rails::JQUERY_2_VERSION
       buf << [ javascript_include_tag("//code.jquery.com/jquery-#{version}.min.js") ]
-      buf << [ javascript_tag("!window.jQuery && document.write(unescape('#{j javascript_include_tag("jquery")}'));") ]
+      buf << [javascript_tag("!window.jQuery && document.write(unescape('#{j javascript_include_tag('jquery2')}'));")]
     else
-      buf << [ javascript_include_tag('jquery') ]
+      buf << [javascript_include_tag("jquery2")]
     end
     buf << [ javascript_include_tag('jquery_ujs') ]
     buf << [ javascript_tag("jQuery.ajaxSetup({'cache': false});") ]

config/application.rb

@@ -70,7 +70,7 @@ module Diaspora
       contact-list.js
       ie.js
       inbox.js
-      jquery.js
+      jquery2.js
       jquery_ujs.js
       jquery-textchange.js
       main.js

spec/controllers/jasmine_fixtures/comments_spec.rb

@@ -1,20 +0,0 @@
-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
-require "spec_helper"
-
-describe CommentsController, type: :controller do
-  describe "#comments" do
-    before do
-      sign_in :user, alice
-    end
-
-    context "jasmine fixtures" do
-      it "generates a jasmine fixture with the mobile comment box", fixture: true do
-        get :new, format: :mobile, post_id: 1
-        save_fixture(html_for("div"), "comments_mobile_commentbox")
-      end
-    end
-  end
-end

spec/helpers/application_helper_spec.rb

@@ -74,7 +74,7 @@ describe ApplicationHelper, :type => :helper do
       end
 
       it 'includes jquery.js from asset pipeline' do
-        expect(jquery_include_tag).to match(/jquery\.js/)
+        expect(jquery_include_tag).to match(/jquery2\.js/)
         expect(jquery_include_tag).not_to match(/jquery\.com/)
       end
     end

spec/javascripts/mobile/mobile_comments_spec.js

@@ -82,14 +82,8 @@ describe("Diaspora.Mobile.Comments", function(){
   describe("createComment", function () {
     beforeEach(function() {
       spec.loadFixture("aspects_index_mobile_post_with_comments");
-      var commentBoxHtml = spec.fixtureHtml("comments_mobile_commentbox");
       var link = $(".stream .comment-action").first();
       Diaspora.Mobile.Comments.showCommentBox(link);
-      jasmine.Ajax.requests.mostRecent().respondWith({
-        status: 200,
-        contentType: "text/html",
-        responseText: commentBoxHtml
-      });
       $(".stream .new_comment").submit(Diaspora.Mobile.Comments.submitComment);
     });