Переглянути джерело

Merge pull request #214 from wittemann/master

Updated qooxdoo wrapper
tags/0.5.2
Jan Lehnardt 14 роки тому
джерело
коміт
3424a740f3
2 змінених файлів з 17 додано та 10 видалено
  1. +1
    -1
      wrappers/qooxdoo/mustache.js.post
  2. +16
    -9
      wrappers/qooxdoo/mustache.js.pre

+ 1
- 1
wrappers/qooxdoo/mustache.js.post Переглянути файл

@@ -4,6 +4,6 @@


// EXPOSE qooxdoo variant // EXPOSE qooxdoo variant
qx.bom.Template.version = Mustache.version; qx.bom.Template.version = Mustache.version;
qx.bom.Template.toHtml = Mustache.render;
qx.bom.Template.render = Mustache.render;


})(); })();

+ 16
- 9
wrappers/qooxdoo/mustache.js.pre Переглянути файл

@@ -5,7 +5,7 @@
http://qooxdoo.org http://qooxdoo.org


Copyright: Copyright:
2004-2011 1&1 Internet AG, Germany, http://www.1und1.de
2004-2012 1&1 Internet AG, Germany, http://www.1und1.de


License: License:
LGPL: http://www.gnu.org/licenses/lgpl.html LGPL: http://www.gnu.org/licenses/lgpl.html
@@ -74,7 +74,7 @@
* For further details, please visit the mustache.js documentation here: * For further details, please visit the mustache.js documentation here:
* https://github.com/janl/mustache.js/blob/master/README.md * https://github.com/janl/mustache.js/blob/master/README.md
*/ */
qx.Class.define("qx.bom.Template", {
qx.Bootstrap.define("qx.bom.Template", {
statics : { statics : {
/** Contains the mustache.js version. */ /** Contains the mustache.js version. */
version: null, version: null,
@@ -83,21 +83,21 @@ qx.Class.define("qx.bom.Template", {
* Original and only template method of mustache.js. For further * Original and only template method of mustache.js. For further
* documentation, please visit https://github.com/janl/mustache.js * documentation, please visit https://github.com/janl/mustache.js
* *
* @signature function(template, view, partials, send_fun)
* @signature function(template, view, partials)
* @param template {String} The String containing the template. * @param template {String} The String containing the template.
* @param view {Object} The object holding the data to render. * @param view {Object} The object holding the data to render.
* @param partials {Object} Object holding parts of a template. * @param partials {Object} Object holding parts of a template.
* @param send_fun {Function?} Callback function for streaming.
* @return {String} The parsed template. * @return {String} The parsed template.
*/ */
toHtml: null,
render: null,




/** /**
* Helper method which provides you with a direct access to templates * Helper method which provides you with a direct access to templates
* stored as HTML in the DOM. The DOM node with the given ID will be reated
* stored as HTML in the DOM. The DOM node with the given ID will be used
* as a template, parsed and a new DOM node will be returned containing the * as a template, parsed and a new DOM node will be returned containing the
* parsed data.
* parsed data. Keep in mind to have only one root DOM element in the the
* template.
* *
* @param id {String} The id of the HTML template in the DOM. * @param id {String} The id of the HTML template in the DOM.
* @param view {Object} The object holding the data to render. * @param view {Object} The object holding the data to render.
@@ -105,14 +105,22 @@ qx.Class.define("qx.bom.Template", {
* @return {DomNode} A DOM element holding the parsed template data. * @return {DomNode} A DOM element holding the parsed template data.
*/ */
get : function(id, view, partials) { get : function(id, view, partials) {
// get the content stored in the DOM
var template = document.getElementById(id); var template = document.getElementById(id);
var inner = template.innerHTML; var inner = template.innerHTML;


// apply the view
inner = this.toHtml(inner, view, partials); inner = this.toHtml(inner, view, partials);


// special case for text only conversion
if (inner.search(/<|>/) === -1) {
return inner;
}

// create a helper to convert the string into DOM nodes
var helper = qx.bom.Element.create("div"); var helper = qx.bom.Element.create("div");
helper.innerHTML = inner; helper.innerHTML = inner;
return helper.children[0]; return helper.children[0];
} }
} }
@@ -124,4 +132,3 @@ qx.Class.define("qx.bom.Template", {
* Below is the original mustache.js code. Snapshot date is mentioned in * Below is the original mustache.js code. Snapshot date is mentioned in
* the head of this file. * the head of this file.
*/ */

Завантаження…
Відмінити
Зберегти