[sagenb] 80/157: fixed rename to work with newer jquery

[felix salfelder]

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

felix-guest pushed a commit to branch master
in repository sagenb.

commit c48734966c2988b547abe2ef6846bf21d8581501
Author: gutow <gutow at uwosh.edu>
Date:   Wed Apr 2 22:04:38 2014 -0500

    fixed rename to work with newer jquery
---
 sagenb/data/sage/html/notebook/base.html |  3 ++-
 sagenb/data/sage/js/notebook_lib.js      | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sagenb/data/sage/html/notebook/base.html b/sagenb/data/sage/html/notebook/base.html
index af3f8ac..7926f31 100644
--- a/sagenb/data/sage/html/notebook/base.html
+++ b/sagenb/data/sage/html/notebook/base.html
@@ -20,7 +20,8 @@ INPUT:
 <script>//jmolInitialize("/java/jmol");
 //jmolSetCallback("menuFile","/java/jmol/appletweb/SageMenu.mnu");
 </script>
-
+<!-- trying to work around JSmol collisions with jquery--->
+<script type="text/javascript" src="/javascript/jquery/jquery-1.11.0.min.js"></script>
 <!-- jQuery UI - interacts, widgets, drag-drop, etc. -->
 <link rel="stylesheet" href="/javascript/jqueryui/css/sage/jquery-ui-1.10.4.custom.css" />
 <script type="text/javascript" src="/javascript/jqueryui/js/jquery-ui-1.10.4.custom.min.js"></script>
diff --git a/sagenb/data/sage/js/notebook_lib.js b/sagenb/data/sage/js/notebook_lib.js
index c481502..e28d205 100644
--- a/sagenb/data/sage/js/notebook_lib.js
+++ b/sagenb/data/sage/js/notebook_lib.js
@@ -276,7 +276,7 @@ function initialize_the_notebook() {
         }
         return toint(id);
     });
-
+    //TODO: why do we do the following twice?
     // Parse active cell IDs and mark these cells as running.  We
     // don't use $.map here, to avoid the possibility of overwriting a
     // debug version of the list.  See debug.js for details.
@@ -786,9 +786,9 @@ function modal_prompt(form_options, options, modal_options) {
     },
     modal_options);
 
-        new_prompt = $($.parseHTML(modal_prompt_element));
-        $('body').append(temp_new_prompt);
-        new_prompt.css(css);
+    new_prompt = $($.parseHTML(modal_prompt_element));
+    $('body').append(new_prompt);
+    new_prompt.css(css);
 
     new_form = new_prompt.find('form');
     if (options.id) {
@@ -816,7 +816,6 @@ function modal_prompt(form_options, options, modal_options) {
         old_success_function(new_form, new_prompt);
         close_dialog();
     };
-
     new_form.ajaxForm(form_options);
     hide_java_applets();
     new_prompt.dialog(modal_options);
@@ -1770,9 +1769,10 @@ function rename_worksheet() {
     };
     modal_prompt({
         success: function (form, prompt) {
-            callback($(':text', form).attr('value'));
+            callback($(':text',form).prop('value'));
         }
     }, {
+        id: "rename_prompt",
         title: translations["Rename worksheet"],
         message: translations['Please enter a name for this worksheet.'],
         'default': worksheet_name,
@@ -3743,7 +3743,7 @@ function set_input_text(id, text) {
 // Dynamic evaluation of javascript related in cell output.
 ///////////////////////////////////////////////////////////////////
 function CellWriter() {
-    /*
+    /*TODO: Jmol does not use anymore. Remove if nothing else depends on it.
     When a new cell is loaded, this class is used to let javascript
     write directly to the document. After that, make sure javascript
     writes to a CellWriter object.  This is used in order to get jmol

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