tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2086 from robert-h-curry/1954-link-editor

Browse Source 
BUG Fix JS issues in treedropdownfield for link editor
This commit is contained in:
Ingo Schommer 2013-06-12 01:18:30 -07:00
commit 4df7f5f0f8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
javascript/TreeDropdownField.js
View File

@ -114,7 +114,7 @@
var node = tree.find('*[data-id="' + val + '"]'),
title = node.children('a').find("span.jstree_pageicon")?node.children('a').find("span.item").html():null;
if(!title) title=(node) ? tree.jstree('get_text', node[0]) : null;
if(!title) title=(node.length > 0) ? tree.jstree('get_text', node[0]) : null;
if(title) self.setTitle(title);
if(node) tree.jstree('select_node', node);
@ -122,8 +122,8 @@
};
// Load the tree if its not already present
if(jQuery.jstree._reference(tree) || !val) updateFn();
else this.loadTree(null, updateFn);
if(!tree.is(':empty') || !val) updateFn();
else this.loadTree({forceValue: val}, updateFn);
},
setValue: function(val) {
this.data('metadata', $.extend(this.data('metadata'), {id: val}));