[DRE-commits] [diaspora] 01/01: relax jquery

[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 02a95c3832b11469d492e60bedb2489663a54eed
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Sep 27 19:48:05 2016 +0530

    relax jquery
---
 debian/changelog                      |  6 ++++++
 debian/patches/070-relax-jquery.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 79c1e1d..75872a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+diaspora (0.6.0.0+debian-3) UNRELEASED; urgency=medium
+
+  * Use jquery in place of jquery2 
+
+ -- Pirate Praveen <praveen at debian.org>  Tue, 27 Sep 2016 19:47:40 +0530
+
 diaspora (0.6.0.0+debian-2) experimental; urgency=medium
 
   * Remove leftover files on uninstall
diff --git a/debian/patches/070-relax-jquery.patch b/debian/patches/070-relax-jquery.patch
new file mode 100644
index 0000000..a8b5b47
--- /dev/null
+++ b/debian/patches/070-relax-jquery.patch
@@ -0,0 +1,25 @@
+--- a/app/helpers/application_helper.rb
++++ b/app/helpers/application_helper.rb
+@@ -54,9 +54,9 @@
+     if AppConfig.privacy.jquery_cdn?
+       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('jquery2')}'));")]
++      buf << [javascript_tag("!window.jQuery && document.write(unescape('#{j javascript_include_tag('jquery')}'));")]
+     else
+-      buf << [javascript_include_tag("jquery2")]
++      buf << [javascript_include_tag("jquery")]
+     end
+     buf << [ javascript_include_tag('jquery_ujs') ]
+     buf << [ javascript_tag("jQuery.ajaxSetup({'cache': false});") ]
+--- a/config/application.rb
++++ b/config/application.rb
+@@ -70,7 +70,7 @@
+       contact-list.js
+       ie.js
+       inbox.js
+-      jquery2.js
++      jquery.js
+       jquery_ujs.js
+       jquery-textchange.js
+       main.js
diff --git a/debian/patches/series b/debian/patches/series
index 696bfce..5467f50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,5 @@
 050-relax-libs.patch
 051-relax-eye.patch
 060-use-db-env.patch
+070-relax-jquery.patch
 0100-set-rails-root.patch

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