[DRE-commits] [diaspora] 01/02: switch back to jquery 2

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora.

commit c695010c21c2b0de61e36cf617963457cc581d0c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Dec 7 23:18:21 2016 +0530

    switch back to jquery 2
---
 debian/control                         |  2 +-
 debian/patches/0120-use-jquery-3.patch | 67 ----------------------------------
 debian/patches/series                  |  1 -
 3 files changed, 1 insertion(+), 69 deletions(-)

diff --git a/debian/control b/debian/control
index fe88e34..fe80e46 100644
--- a/debian/control
+++ b/debian/control
@@ -101,7 +101,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-uglifier (>= 2.7.2~),
  ruby-backbone-on-rails (>= 1.2.0.0~),
  ruby-handlebars-assets (>= 2:0.23.1~),
- ruby-jquery-rails (>= 4.2.1~),
+ ruby-jquery-rails (>= 4.2.1-2~),
  ruby-jquery-ui-rails (>= 5.0.5~),
  ruby-js-image-paths (>= 0.1~),
  ruby-js-routes (>= 1.2.4~),
diff --git a/debian/patches/0120-use-jquery-3.patch b/debian/patches/0120-use-jquery-3.patch
deleted file mode 100644
index cbfa9f2..0000000
--- a/debian/patches/0120-use-jquery-3.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 657d06c49061a499b93ca0e43f35b70cad785a3b Mon Sep 17 00:00:00 2001
-From: cmrd Senya <senya at riseup.net>
-Date: Thu, 10 Nov 2016 17:46:31 +0200
-Subject: [PATCH] jQuery 3 integration
-
----
- app/assets/javascripts/jasmine-load-all.js | 2 +-
- app/helpers/application_helper.rb          | 8 +++++---
- config/application.rb                      | 2 +-
- spec/helpers/application_helper_spec.rb    | 2 +-
- 6 files changed, 12 insertions(+), 10 deletions(-)
-
-Index: diaspora/app/assets/javascripts/jasmine-load-all.js
-===================================================================
---- diaspora.orig/app/assets/javascripts/jasmine-load-all.js
-+++ diaspora/app/assets/javascripts/jasmine-load-all.js
-@@ -1,4 +1,4 @@
--//= require jquery2
-+//= require jquery3
- //= require handlebars.runtime
- //= require templates
- //= require main
-Index: diaspora/app/helpers/application_helper.rb
-===================================================================
---- diaspora.orig/app/helpers/application_helper.rb
-+++ diaspora/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_2_VERSION
-+      version = Jquery::Rails::JQUERY_3_VERSION
-       buf << [ javascript_include_tag("//code.jquery.com/jquery-#{version}.min.js") ]
--      buf << [javascript_tag("!window.jQuery && document.write(unescape('#{j javascript_include_tag('jquery2')}'));")]
-+      buf << [javascript_tag("!window.jQuery && document.write(unescape('#{j javascript_include_tag('jquery3')}'));")]
-     else
--      buf << [javascript_include_tag("jquery2")]
-+      buf << [javascript_include_tag("jquery3")]
-     end
-     buf << [ javascript_include_tag('jquery_ujs') ]
-     buf << [ javascript_tag("jQuery.ajaxSetup({'cache': false});") ]
-Index: diaspora/config/application.rb
-===================================================================
---- diaspora.orig/config/application.rb
-+++ diaspora/config/application.rb
-@@ -70,7 +70,7 @@ module Diaspora
-       contact-list.js
-       ie.js
-       inbox.js
--      jquery2.js
-+      jquery3.js
-       jquery_ujs.js
-       jquery-textchange.js
-       main.js
-Index: diaspora/spec/helpers/application_helper_spec.rb
-===================================================================
---- diaspora.orig/spec/helpers/application_helper_spec.rb
-+++ diaspora/spec/helpers/application_helper_spec.rb
-@@ -74,7 +74,7 @@ describe ApplicationHelper, :type => :he
-       end
- 
-       it 'includes jquery.js from asset pipeline' do
--        expect(jquery_include_tag).to match(/jquery2\.js/)
-+        expect(jquery_include_tag).to match(/jquery3\.js/)
-         expect(jquery_include_tag).not_to match(/jquery\.com/)
-       end
-     end
diff --git a/debian/patches/series b/debian/patches/series
index f884ba4..494fcdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@
 060-use-db-env.patch
 0100-set-rails-root.patch
 0110-remove-stop-all-from-eye.patch
-0120-use-jquery-3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git