forked from zTree/zTree_v3
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix issue about : drag-drop node will throw error, if the page has if…
…rame. fix issue about : after remove all the child nodes, you use addNodes() method to add node to the parent node, you will can't see the node's DOM
- Loading branch information
zTree
committed
Jun 12, 2013
1 parent
03c4f8f
commit bbc9e06
Showing
13 changed files
with
151 additions
and
143 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
|
||
/* | ||
* JQuery zTree core 3.5.13 | ||
* JQuery zTree core 3.5.14-beta.1 | ||
* http://zTree.me/ | ||
* | ||
* Copyright (c) 2010 Hunter.z | ||
|
@@ -9,7 +9,7 @@ | |
* http://www.opensource.org/licenses/mit-license.php | ||
* | ||
* email: [email protected] | ||
* Date: 2013-06-02 | ||
* Date: 2013-06-12 | ||
*/ | ||
(function($){ | ||
var settings = {}, roots = {}, caches = {}, | ||
|
@@ -875,12 +875,13 @@ | |
nObj = $$(node, setting); | ||
} | ||
var ulObj = $$(node, consts.id.UL, setting); | ||
if (!ulObj.get(0)) { | ||
var childKey = setting.data.key.children, | ||
childHtml = view.appendNodes(setting, node.level+1, node[childKey], node, false, true); | ||
view.makeUlHtml(setting, node, html, childHtml.join('')); | ||
nObj.append(html.join('')); | ||
if (ulObj.get(0)) { | ||
ulObj.remove(); | ||
} | ||
var childKey = setting.data.key.children, | ||
childHtml = view.appendNodes(setting, node.level+1, node[childKey], node, false, true); | ||
view.makeUlHtml(setting, node, html, childHtml.join('')); | ||
nObj.append(html.join('')); | ||
}, | ||
asyncNode: function(setting, node, isSilent, callback) { | ||
var i, l; | ||
|
@@ -1671,7 +1672,7 @@ | |
consts = zt.consts; | ||
})(jQuery); | ||
/* | ||
* JQuery zTree excheck 3.5.13 | ||
* JQuery zTree excheck 3.5.14-beta.1 | ||
* http://zTree.me/ | ||
* | ||
* Copyright (c) 2010 Hunter.z | ||
|
@@ -1680,7 +1681,7 @@ | |
* http://www.opensource.org/licenses/mit-license.php | ||
* | ||
* email: [email protected] | ||
* Date: 2013-06-02 | ||
* Date: 2013-06-12 | ||
*/ | ||
(function($){ | ||
//default consts of excheck | ||
|
@@ -2297,7 +2298,7 @@ | |
} | ||
})(jQuery); | ||
/* | ||
* JQuery zTree exedit 3.5.13 | ||
* JQuery zTree exedit 3.5.14-beta.1 | ||
* http://zTree.me/ | ||
* | ||
* Copyright (c) 2010 Hunter.z | ||
|
@@ -2306,7 +2307,7 @@ | |
* http://www.opensource.org/licenses/mit-license.php | ||
* | ||
* email: [email protected] | ||
* Date: 2013-06-02 | ||
* Date: 2013-06-12 | ||
*/ | ||
(function($){ | ||
//default consts of exedit | ||
|
@@ -3018,8 +3019,10 @@ | |
//method of tools for zTree | ||
_tools = { | ||
getAbs: function (obj) { | ||
var oRect = obj.getBoundingClientRect(); | ||
return [oRect.left,oRect.top] | ||
var oRect = obj.getBoundingClientRect(), | ||
scrollTop = document.body.scrollTop+document.documentElement.scrollTop, | ||
scrollLeft = document.body.scrollLeft+document.documentElement.scrollLeft; | ||
return [oRect.left+scrollLeft,oRect.top+scrollTop]; | ||
}, | ||
inputFocus: function(inputObj) { | ||
if (inputObj.get(0)) { | ||
|
@@ -3059,7 +3062,7 @@ | |
var obj = iframeList.get(i), | ||
r = tools.getAbs(obj), | ||
dragMask = $$("<div id='zTreeMask_" + i + "' class='zTreeMask' style='top:" + r[1] + "px; left:" + r[0] + "px; width:" + obj.offsetWidth + "px; height:" + obj.offsetHeight + "px;'></div>", setting); | ||
dragMask.appendTo(body); | ||
dragMask.appendTo($$("body", setting)); | ||
root.dragMaskList.push(dragMask); | ||
} | ||
} | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* JQuery zTree core 3.5.13 | ||
* JQuery zTree core 3.5.14-beta.1 | ||
* http://zTree.me/ | ||
* | ||
* Copyright (c) 2010 Hunter.z | ||
|
@@ -8,7 +8,7 @@ | |
* http://www.opensource.org/licenses/mit-license.php | ||
* | ||
* email: [email protected] | ||
* Date: 2013-06-02 | ||
* Date: 2013-06-12 | ||
*/ | ||
(function($){ | ||
var settings = {}, roots = {}, caches = {}, | ||
|
@@ -874,12 +874,13 @@ | |
nObj = $$(node, setting); | ||
} | ||
var ulObj = $$(node, consts.id.UL, setting); | ||
if (!ulObj.get(0)) { | ||
var childKey = setting.data.key.children, | ||
childHtml = view.appendNodes(setting, node.level+1, node[childKey], node, false, true); | ||
view.makeUlHtml(setting, node, html, childHtml.join('')); | ||
nObj.append(html.join('')); | ||
if (ulObj.get(0)) { | ||
ulObj.remove(); | ||
} | ||
var childKey = setting.data.key.children, | ||
childHtml = view.appendNodes(setting, node.level+1, node[childKey], node, false, true); | ||
view.makeUlHtml(setting, node, html, childHtml.join('')); | ||
nObj.append(html.join('')); | ||
}, | ||
asyncNode: function(setting, node, isSilent, callback) { | ||
var i, l; | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* JQuery zTree excheck 3.5.13 | ||
* JQuery zTree excheck 3.5.14-beta.1 | ||
* http://zTree.me/ | ||
* | ||
* Copyright (c) 2010 Hunter.z | ||
|
@@ -8,7 +8,7 @@ | |
* http://www.opensource.org/licenses/mit-license.php | ||
* | ||
* email: [email protected] | ||
* Date: 2013-06-02 | ||
* Date: 2013-06-12 | ||
*/ | ||
(function($){ | ||
//default consts of excheck | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
/* | ||
* JQuery zTree exedit 3.5.13 | ||
* JQuery zTree exedit 3.5.14-beta.1 | ||
* http://zTree.me/ | ||
* | ||
* Copyright (c) 2010 Hunter.z | ||
|
@@ -8,7 +8,7 @@ | |
* http://www.opensource.org/licenses/mit-license.php | ||
* | ||
* email: [email protected] | ||
* Date: 2013-06-02 | ||
* Date: 2013-06-12 | ||
*/ | ||
(function($){ | ||
//default consts of exedit | ||
|
@@ -720,8 +720,10 @@ | |
//method of tools for zTree | ||
_tools = { | ||
getAbs: function (obj) { | ||
var oRect = obj.getBoundingClientRect(); | ||
return [oRect.left,oRect.top] | ||
var oRect = obj.getBoundingClientRect(), | ||
scrollTop = document.body.scrollTop+document.documentElement.scrollTop, | ||
scrollLeft = document.body.scrollLeft+document.documentElement.scrollLeft; | ||
return [oRect.left+scrollLeft,oRect.top+scrollTop]; | ||
}, | ||
inputFocus: function(inputObj) { | ||
if (inputObj.get(0)) { | ||
|
@@ -761,7 +763,7 @@ | |
var obj = iframeList.get(i), | ||
r = tools.getAbs(obj), | ||
dragMask = $$("<div id='zTreeMask_" + i + "' class='zTreeMask' style='top:" + r[1] + "px; left:" + r[0] + "px; width:" + obj.offsetWidth + "px; height:" + obj.offsetHeight + "px;'></div>", setting); | ||
dragMask.appendTo(body); | ||
dragMask.appendTo($$("body", setting)); | ||
root.dragMaskList.push(dragMask); | ||
} | ||
} | ||
|
Oops, something went wrong.