tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7874 from flamerohr/pulls/3.6/to-match-thy-father 

FIX Split HTML manipulation to onadd, so elements are not accidentally duplicated
This commit is contained in:
Loz Calver 2018-02-28 10:06:36 +00:00 committed by GitHub
parent 1bec8a5d0c 86addea1d2
commit 535d02ffeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
javascript/TreeDropdownField.js
View File

@ -47,13 +47,15 @@
// XMLHttpRequest
CurrentXhr: null,
onmatch: function() {
onadd: function() {
this.append(
'<span class="treedropdownfield-title"></span>' +
'<div class="treedropdownfield-toggle-panel-link"><a href="#" class="ui-icon ui-icon-triangle-1-s"></a></div>' +
'<div class="treedropdownfield-panel"><div class="tree-holder"></div></div>'
);
},
onmatch: function() {
var linkTitle = strings.openLink;
if(linkTitle) this.find("treedropdownfield-toggle-panel-link a").attr('title', linkTitle);
if(this.data('title')) this.setTitle(this.data('title'));
@ -334,7 +336,7 @@
});
$('.TreeDropdownField.searchable').entwine({
onmatch: function() {
onadd: function() {
this._super();
var title = ss.i18n._t('TreeDropdownField.ENTERTOSEARCH');
this.find('.treedropdownfield-panel').prepend(