[sagenb] 10/14: Fix more bullshit, and move needs-forwarding patches before the others
Ximin Luo
infinity0 at debian.org
Fri Dec 2 22:52:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository sagenb.
commit 9c5b568f3ef5386f2da0140b9d3b67aee1e5a728
Author: Ximin Luo <infinity0 at pwned.gg>
Date: Fri Dec 2 22:18:57 2016 +0100
Fix more bullshit, and move needs-forwarding patches before the others
---
debian/copyright | 1 +
debian/patches/disable-farbtastic-jpicker.patch | 20 ++++++++++----------
debian/patches/fix-bullshit.patch | 11 +++++++++++
debian/patches/series | 4 ++--
.../switch-system-jquery-vanderlee-colorpicker.patch | 10 +++++-----
debian/rules | 1 +
6 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index d2b7ce0..3573470 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,6 +4,7 @@ Upstream-Contact: The Sage Development Team <sage-notebook at googlegroups.com>
Source: https://github.com/sagemath/sagenb
Files-Excluded:
*.min.js
+ *.mini.js
*-min.js
sagenb/data/codemirror/*
sagenb/data/highlight/*
diff --git a/debian/patches/disable-farbtastic-jpicker.patch b/debian/patches/disable-farbtastic-jpicker.patch
index 0a29217..3da6fd1 100644
--- a/debian/patches/disable-farbtastic-jpicker.patch
+++ b/debian/patches/disable-farbtastic-jpicker.patch
@@ -69,7 +69,7 @@ Forwarded: not-needed
elif widget == 'colorpicker':
# HTML
-@@ -560,72 +520,7 @@
+@@ -572,72 +532,7 @@
</script>""" % (default, id, id, id, default, default, change)
elif widget == 'jpicker':
@@ -143,7 +143,7 @@ Forwarded: not-needed
return s
-@@ -2375,8 +2270,8 @@
+@@ -2387,8 +2282,8 @@
* ``u = color_selector(default=(0,0,1), label=None,
widget='colorpicker', hide_box=False)`` - a color selector with a
@@ -154,7 +154,7 @@ Forwarded: not-needed
* ``u = text_control(value='')`` - a block of text
-@@ -2873,8 +2768,8 @@
+@@ -2885,8 +2780,8 @@
the left of the selector.
- ``widget`` - a string (default: 'colorpicker'); the color
@@ -165,7 +165,7 @@ Forwarded: not-needed
- ``hide_box`` - a boolean (default: False); whether to hide
the input box associated with the color selector widget
-@@ -2883,8 +2778,6 @@
+@@ -2895,8 +2790,6 @@
sage: color_selector()
Interact color selector labeled None, with default RGB color (0.0, 0.0, 1.0), widget 'colorpicker', and visible input box
@@ -174,7 +174,7 @@ Forwarded: not-needed
sage: color_selector(default = Color(0, 0.5, 0.25))
Interact color selector labeled None, with default RGB color (0.0, 0.5, 0.25), widget 'colorpicker', and visible input box
sage: color_selector('purple', widget = 'colorpicker')
-@@ -2893,12 +2786,6 @@
+@@ -2905,12 +2798,6 @@
Traceback (most recent call last):
...
ValueError: unknown color 'crayon'
@@ -187,7 +187,7 @@ Forwarded: not-needed
"""
input_box.__init__(self, default=Color(default), label=label,
type=Color, widget=widget, hide_box=hide_box)
-@@ -2917,8 +2804,6 @@
+@@ -2929,8 +2816,6 @@
sage: color_selector(Color('red'), 'line color').__repr__()
"Interact color selector labeled 'line color', with default RGB color (1.0, 0.0, 0.0), widget 'colorpicker', and visible input box"
@@ -196,7 +196,7 @@ Forwarded: not-needed
"""
s = "Interact color selector labeled %r, with default %r, widget %r, and " % (self.label(), self.default(), self.widget())
if self.hide_box():
-@@ -2938,10 +2823,6 @@
+@@ -2950,10 +2835,6 @@
sage: color_selector().widget()
'colorpicker'
@@ -207,7 +207,7 @@ Forwarded: not-needed
sage: color_selector(default=Color(0,0.5,0.25)).widget()
'colorpicker'
"""
-@@ -2960,8 +2841,6 @@
+@@ -2972,8 +2853,6 @@
sage: color_selector().hide_box()
False
@@ -228,8 +228,8 @@ Forwarded: not-needed
<script type="text/javascript" src="/javascript/jquery/plugins/form/jquery.form.min.js"></script>
-<link rel="stylesheet" href="/javascript/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css" type="text/css" />
-<script type="text/javascript" src="/javascript/jquery/plugins/jpicker/jpicker-1.1.6.min.js"></script>
- <link rel="stylesheet" media="screen" type="text/css" href="/javascript/jquery/plugins/colorpicker/jquery.colorpicker.css" />
- <script type="text/javascript" src="/javascript/jquery/plugins/colorpicker/jquery.colorpicker.js"></script>
+ <link rel="stylesheet" media="screen" type="text/css" href="/javascript/jquery/plugins/colorpicker/css/colorpicker.css" />
+ <script type="text/javascript" src="/javascript/jquery/plugins/colorpicker/js/colorpicker.min.js"></script>
<script type="text/javascript" src="/javascript/jquery/plugins/achtung/ui.achtung-mod.min.js"></script>
--- a/sagenb/data/sage/html/settings/notebook_settings.html
+++ b/sagenb/data/sage/html/settings/notebook_settings.html
diff --git a/debian/patches/fix-bullshit.patch b/debian/patches/fix-bullshit.patch
index 4af6ed0..fc87657 100644
--- a/debian/patches/fix-bullshit.patch
+++ b/debian/patches/fix-bullshit.patch
@@ -13,3 +13,14 @@ Forwarded: TODO
canvas.height = img.height;
var context = canvas.getContext("2d");
context.putImageData(img, 0, 0);
+--- a/sagenb/data/sage/html/notebook/base.html
++++ b/sagenb/data/sage/html/notebook/base.html
+@@ -52,7 +52,7 @@
+ {% if JEDITABLE_TINYMCE and not worksheet.docbrowser() and not worksheet.is_published() %}
+ <!-- TinyMCE and jEditable - in-place editing of text cells -->
+ <script type="text/javascript" src="/javascript/tiny_mce/tiny_mce.js"></script>
+-<script type="text/javascript" src="/javascript/jquery/plugins/jeditable/jquery.jeditable.mini.js" charset="utf-8"></script>
++<script type="text/javascript" src="/javascript/jquery/plugins/jeditable/jquery.jeditable.min.js" charset="utf-8"></script>
+ <script type="text/javascript" src="/javascript/sage/js/tinymce.js"></script>
+ <script type="text/javascript" src="/javascript/tiny_mce/plugins/media/js/embed.js"></script>
+ {% endif %}
diff --git a/debian/patches/series b/debian/patches/series
index 4ada37d..5762485 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,9 @@
#fix-test-case.patch
fix-sass-syntax.patch
fix-bullshit.patch
-use-system-jquery.patch
update-flask-0.11.patch
update-codemirror-version.patch
-switch-system-jquery-vanderlee-colorpicker.patch
+use-system-jquery.patch
disable-bgiframe.patch
disable-farbtastic-jpicker.patch
+switch-system-jquery-vanderlee-colorpicker.patch
diff --git a/debian/patches/switch-system-jquery-vanderlee-colorpicker.patch b/debian/patches/switch-system-jquery-vanderlee-colorpicker.patch
index 5e67482..89f5961 100644
--- a/debian/patches/switch-system-jquery-vanderlee-colorpicker.patch
+++ b/debian/patches/switch-system-jquery-vanderlee-colorpicker.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
--- a/sagenb/notebook/interact.py
+++ b/sagenb/notebook/interact.py
-@@ -523,18 +523,12 @@
+@@ -483,18 +483,12 @@
<input type="text"
id="%s"
name="color"
@@ -28,7 +28,7 @@ Forwarded: not-needed
# JS
s += """<script>
-@@ -546,27 +540,21 @@
+@@ -506,27 +500,21 @@
// Should be good enough:
color: (parseInt(def.slice(0, 2), 16) + parseInt(def.slice(2, 4), 16) + parseInt(def.slice(4, 6), 16)) / 3 > 127 ? '#000000' : '#ffffff'
});
@@ -73,10 +73,10 @@ Forwarded: not-needed
</script>""" % (default, id, id, id, default, default, change)
--- a/sagenb/data/sage/html/notebook/base.html
+++ b/sagenb/data/sage/html/notebook/base.html
-@@ -27,8 +27,8 @@
+@@ -23,8 +23,8 @@
+ <!-- jQuery plugins - color pickers, shift-click, AJAX forms, IE fixes, notifications -->
+ <script type="text/javascript" src="/javascript/jquery/plugins/extendedclick/jquery.event.extendedclick.min.js"></script>
<script type="text/javascript" src="/javascript/jquery/plugins/form/jquery.form.min.js"></script>
- <link rel="stylesheet" href="/javascript/jquery/plugins/jpicker/css/jPicker-1.1.6.min.css" type="text/css" />
- <script type="text/javascript" src="/javascript/jquery/plugins/jpicker/jpicker-1.1.6.min.js"></script>
-<link rel="stylesheet" media="screen" type="text/css" href="/javascript/jquery/plugins/colorpicker/css/colorpicker.css" />
-<script type="text/javascript" src="/javascript/jquery/plugins/colorpicker/js/colorpicker.min.js"></script>
+<link rel="stylesheet" media="screen" type="text/css" href="/javascript/jquery/plugins/colorpicker/jquery.colorpicker.css" />
diff --git a/debian/rules b/debian/rules
index 4f7e429..3f8af62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ MIN_JS = \
# sagenb/data/jquery/plugins/achtung/ui.achtung-min.js \
sagenb/data/jquery/plugins/achtung/ui.achtung-mod.min.js \
sagenb/data/jquery/plugins/extendedclick/jquery.event.extendedclick.min.js \
+ sagenb/data/jquery/plugins/jeditable/jquery.jeditable.min.js \
sagenb/data/openid-realselector/js/jquery.openid.min.js \
%:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git
More information about the debian-science-commits
mailing list