extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-17 20:11:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Etemplate now uses JSON instead of XML for templates on the client side.

Browse Source 
XML files are parsed into JSON objects on the server, then sent as JSON.
Etemplate parses the JSON object on the client side instead of the XML file directly.  This is supposed to be faster for IE.
This commit is contained in:
Nathan Gray
2015-08-18 17:47:40 +00:00
parent beb829c315
commit ecb972ca66
15 changed files with 366 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
etemplate/js/et2_widget_grid.js
View File

@@ -352,9 +352,9 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
var cell = this._getCell(cells, x, y);
// Read the span value of the element
if (node.getAttribute("span"))
if (node.attributes.span)
{
cell.rowSpan = node.getAttribute("span");
cell.rowSpan = node.attributes.span;
}
else
{
@@ -423,9 +423,9 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
var cell = this._getCell(cells, x, y);
// Read the span value of the element
if (node.getAttribute("span"))
if (node.attributes && node.attributes.span)
{
cell.colSpan = node.getAttribute("span");
cell.colSpan = node.attributes.span;
}
else
{
@@ -441,20 +441,20 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
var span = cell.colSpan = this._forceNumber(cell.colSpan);
// Read the align value of the element
if (node.getAttribute("align"))
if (node.attributes && node.attributes.align)
{
cell.align = node.getAttribute("align");
cell.align = node.attributes.align;
}
// store id of nextmatch-*headers, so it is available for disabled widgets, which get not instanciated
if (nodeName.substr(0, 10) == 'nextmatch-')
{
cell.nm_id = node.getAttribute('id');
cell.nm_id = node.attributes.id;
}
// Apply widget's class to td, for backward compatability
if(node.getAttribute("class"))
if(node.attributes && node.attributes.class)
{
cell.class += (cell.class ? " " : "") + node.getAttribute("class");
cell.class += (cell.class ? " " : "") + node.attributes.class;
}
// Create the element
@@ -480,7 +480,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
}
var widget = this.createElementFromNode(node, nodeName);
var widget = this.createElementFromObject(node, nodeName);
}
// Fill all cells the widget is spanning
@@ -520,7 +520,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
}
// If row disabled, just skip it
var disabled = false;
if(node.getAttribute("disabled") == "1")
if(et2_readAttrWithDefault(node, "disabled", false) == "1")
{
disabled = true;
}
@@ -595,23 +595,23 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
/**
* As the does not fit very well into the default widget structure, we're
* overwriting the loadFromXML function and doing a two-pass reading -
* overwriting the loadFromJSON function and doing a two-pass reading -
* in the first step the
*
* @param {object} _node xml node to process
*/
loadFromXML: function(_node) {
loadFromJSON: function(_node) {
// Keep the node for later changing / reloading
this.template_node = _node;
// Get the columns and rows tag
var rowsElems = et2_directChildrenByTagName(_node, "rows");
var columnsElems = et2_directChildrenByTagName(_node, "columns");
var rowsElems = _node.children[1];
var columnsElems = _node.children[0];
if (rowsElems.length == 1 && columnsElems.length == 1)
if (rowsElems && columnsElems)
{
var columns = columnsElems[0];
var rows = rowsElems[0];
var columns = columnsElems;
var rows = rowsElems;
var colData = [];
var rowData = [];
@@ -870,7 +870,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
}
// Rebuild grid
this.loadFromXML(this.template_node);
this.loadFromJSON(this.template_node);
// New widgets need to finish
this.loadingFinished();