holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix spelling, avoid DOM error if you try to remove a node that wasn't added

Browse Source
This commit is contained in:
Nathan Gray 2013-05-27 23:24:22 +00:00
parent 7c7e100842
commit 78b1fffc81
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etemplate/js/et2_core_DOMWidget.js
View File

@ -99,7 +99,7 @@ var et2_DOMWidget = et2_widget.extend(et2_IDOMNode,
*/ */
destroy: function() { destroy: function() {
this.detatchFromDOM(); this.detachFromDOM();
this.parentNode = null; this.parentNode = null;
this._attachSet = {}; this._attachSet = {};
@ -136,12 +136,16 @@ var et2_DOMWidget = et2_widget.extend(et2_IDOMNode,
* Detaches the widget from the DOM tree, if it had been attached to the * Detaches the widget from the DOM tree, if it had been attached to the
* DOM-Tree using the attachToDOM method. * DOM-Tree using the attachToDOM method.
*/ */
detatchFromDOM: function() { detachFromDOM: function() {
if (this._attachSet.node && this._attachSet.parent) if (this._attachSet.node && this._attachSet.parent)
{ {
// Remove the current node from the parent node // Remove the current node from the parent node
this._attachSet.parent.removeChild(this._attachSet.node); try {
this._attachSet.parent.removeChild(this._attachSet.node);
} catch (e) {
// Don't throw a DOM error if the node wasn't in the parent
}
// Reset the "attachSet" // Reset the "attachSet"
this._attachSet = { this._attachSet = {
@ -235,7 +239,7 @@ var et2_DOMWidget = et2_widget.extend(et2_IDOMNode,
if (_node != this.parentNode) if (_node != this.parentNode)
{ {
// Detatch this element from the DOM tree // Detatch this element from the DOM tree
this.detatchFromDOM(); this.detachFromDOM();
this.parentNode = _node; this.parentNode = _node;
@ -647,7 +651,7 @@ var et2_surroundingsMgr = Class.extend(
// and trigger the _rebuildContainer function. // and trigger the _rebuildContainer function.
if (attached && this.widget) if (attached && this.widget)
{ {
this.widget.detatchFromDOM(); this.widget.detachFromDOM();
this.widget.attachToDOM(); this.widget.attachToDOM();
} }
} }

4
etemplate/js/et2_core_baseWidget.js
View File

@ -176,7 +176,7 @@ var et2_baseWidget = et2_DOMWidget.extend(et2_IAligned,
} }
}, },
detatchFromDOM: function() { detachFromDOM: function() {
// Detach this node from the tooltip node // Detach this node from the tooltip node
if (this._tooltipElem) if (this._tooltipElem)
{ {
@ -212,7 +212,7 @@ var et2_baseWidget = et2_DOMWidget.extend(et2_IAligned,
if (_node != this.node) if (_node != this.node)
{ {
// Deatch the old node from the DOM // Deatch the old node from the DOM
this.detatchFromDOM(); this.detachFromDOM();
// Set the new DOM-Node // Set the new DOM-Node
this.node = _node; this.node = _node;