[sagenb] 02/14: Remove CodeMirror from the orig tarball and update its usage to the version in Debian

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository sagenb.

commit f99ba8a1f9419826511b2823ff94ac7e4e96722a
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Fri Dec 2 19:40:06 2016 +0100

    Remove CodeMirror from the orig tarball and update its usage to the version in Debian
---
 debian/control                                 |  1 +
 debian/copyright                               |  1 +
 debian/patches/series                          |  5 ++-
 debian/patches/update-codemirror-version.patch | 55 ++++++++++++++++++++++++++
 debian/python-sagenb.links                     |  1 +
 5 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 6e80998..89be792 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Standards-Version: 3.9.7
 Package: python-sagenb
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends},
+ libjs-codemirror,
  libjs-jquery,
  libjs-jquery-form,
  libjs-jquery-ui,
diff --git a/debian/copyright b/debian/copyright
index 13aa016..5622490 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
+ sagenb/data/codemirror/*
  sagenb/data/highlight/*
  sagenb/data/jquery/jquery*.js
  sagenb/data/jquery/plugins/form/*
diff --git a/debian/patches/series b/debian/patches/series
index 8c93dd6..0153ac4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
-update-flask-0.11.patch
 #fix-test-case.patch
-use-system-jquery.js
 fix-sass-syntax.patch
+use-system-jquery.js
+update-flask-0.11.patch
+update-codemirror-version.patch
diff --git a/debian/patches/update-codemirror-version.patch b/debian/patches/update-codemirror-version.patch
new file mode 100644
index 0000000..17ec8b6
--- /dev/null
+++ b/debian/patches/update-codemirror-version.patch
@@ -0,0 +1,55 @@
+Description: Update to CodeMirror 5.4.0 API
+Author: Ximin Luo <infinity0 at debian.org>
+Forwarded: TODO
+--- a/sagenb/data/sage/html/notebook/download_or_delete_datafile.html
++++ b/sagenb/data/sage/html/notebook/download_or_delete_datafile.html
+@@ -13,7 +13,7 @@
+ 
+ {% block more_css %}
+ <style type="text/css">
+-    .CodeMirror-line-numbers {
++    .CodeMirror-linenumber {
+ 	border-right: 1px dotted blue;
+ 	font-family: monospace;
+ 	font-size: 10pt;
+@@ -26,7 +26,9 @@
+ {% endblock %}
+ 
+ {% block more_javascript %}
+-<script type="text/javascript" src="/javascript/codemirror/js/codemirror.js"></script>
++<link rel="stylesheet" href="/javascript/codemirror/lib/codemirror.css">
++<script type="text/javascript" src="/javascript/codemirror/lib/codemirror.js"></script>
++<script type="text/javascript" src="/javascript/codemirror/mode/python/python.js"></script>
+ {% endblock %}
+ 
+ {% set path = "/home/%s/data/%s"|format(worksheet.filename(), filename_) %}
+@@ -57,20 +59,15 @@
+     </div>
+     <script type="text/javascript">
+     $(document).ready(function () {
+-	CodeMirror.fromTextArea('textfield', {
+-	    parserfile: "../contrib/python/js/parsepython.js",
+-	    stylesheet: "/javascript/codemirror/contrib/python/css/pythoncolors.css",
+-	    path: "/javascript/codemirror/js/",
+-	    height: '25.0em',
+-	    width: '100%',
+-	    indentUnit: 4,
+-	    lineNumbers: true,
+-	    textWrapping: false,
+-            parserConfig: {
+-		'pythonVersion': 2,
+-		'strictErrors': true
+-	    }
+-	}); 
++	CodeMirror.fromTextArea(document.getElementById('textfield'), {
++		mode: "python",
++		indentUnit: 4,
++		lineNumbers: true,
++		lineWrapping: false,
++		parserConfig: {
++			'version': 2,
++		}
++	}).setSize('100%', '25.0em');
+       });
+     </script>
+     <input type="hidden" name="filename" value="{{ filename_ }}" id="filename" />
diff --git a/debian/python-sagenb.links b/debian/python-sagenb.links
index 5ade813..064ea17 100644
--- a/debian/python-sagenb.links
+++ b/debian/python-sagenb.links
@@ -1,3 +1,4 @@
+/usr/share/javascript/codemirror                /usr/lib/python2.7/dist-packages/sagenb/data/codemirror
 /usr/share/javascript/prettify                  /usr/lib/python2.7/dist-packages/sagenb/data/highlight
 /usr/share/javascript/jquery/jquery.js          /usr/lib/python2.7/dist-packages/sagenb/data/jquery/jquery.js
 /usr/share/javascript/jquery/jquery.min.js      /usr/lib/python2.7/dist-packages/sagenb/data/jquery/jquery.min.js

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git