From 1a65a8d09e07f68e9dde662430719cfa84a0fd77 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C5=81ukasz=20Rekucki?= <lrekucki@gmail.com>
Date: Fri, 9 Oct 2009 18:09:27 +0200
Subject: [PATCH] =?utf8?q?Quote=20escape=20dla=20tooltip=C3=B3w.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
project/static/js/app.js | 5 +++--
project/static/js/models.js | 10 +++++++++-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/project/static/js/app.js b/project/static/js/app.js
index 9de3c7f0..fde15393 100644
--- 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
- // 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).
+
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")
diff --git a/project/static/js/models.js b/project/static/js/models.js
index c03aa1e7..ab021f51 100644
--- 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);
}
});
--
2.20.1