Quote escape dla tooltipów.

diff --git a/project/static/js/app.js b/project/static/js/app.js
index 9de3c7f..fde1539 100644 (file)
--- a/project/static/js/app.js
+++ b/project/static/js/app.js
@@ -49,20 +49,21 @@ if (typeof console === 'undefined') {
 
   this.render_template = function render_template(str, data){
     // Figure out if we're getting a template, or if we need to
 
   this.render_template = function render_template(str, data){
     // Figure out if we're getting a template, or if we need to

-    // load the template - and be sure to cache the result.
+    // load the template - and be sure to cache the result.    

     var fn = !/^[\d\s-_]/.test(str) ?
       cache[str] = cache[str] ||
         render_template(document.getElementById(str).innerHTML) :
 
       // Generate a reusable function that will serve as a template
       // generator (and which will be cached).
     var fn = !/^[\d\s-_]/.test(str) ?
       cache[str] = cache[str] ||
         render_template(document.getElementById(str).innerHTML) :
 
       // Generate a reusable function that will serve as a template
       // generator (and which will be cached).

+      

       new Function("obj",
         "var p=[],print=function(){p.push.apply(p,arguments);};" +
 
         // Introduce the data as local variables using with(){}
         "with(obj){p.push('" +
 
       new Function("obj",
         "var p=[],print=function(){p.push.apply(p,arguments);};" +
 
         // Introduce the data as local variables using with(){}
         "with(obj){p.push('" +
 

-        // Convert the template into pure JavaScript
+        // Convert the template into pure JavaScript       

         str
           .replace(/[\r\t\n]/g, " ")
           .split("<%").join("\t")
         str
           .replace(/[\r\t\n]/g, " ")
           .split("<%").join("\t")

diff --git a/project/static/js/models.js b/project/static/js/models.js
index c03aa1e..ab021f5 100644 (file)
--- a/project/static/js/models.js
+++ b/project/static/js/models.js
@@ -23,7 +23,15 @@ Editor.ToolbarButtonsModel = Editor.Model.extend({
         }
     },
   
         }
     },
   

-    loadSucceeded: function(data) {
+    loadSucceeded: function(data)
+    {
+        // do some escaping
+        $.each(data, function() {
+            $.each(this.buttons, function() {
+                //do some lame escapes
+                this.tooltip = this.tooltip.replace(/"/g, """);
+            });
+        });

         this.set('buttons', data);
     }
 });
         this.set('buttons', data);
     }
 });