TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'builder-ui' into develop

This commit is contained in:
alekseybobkov 2016-02-07 14:41:45 -08:00
parent 5de725696e 1454a4ed6b
commit c762ed2836
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/system/assets/ui/js/inspector.editor.stringlistautocomplete.js
View File

@ -514,6 +514,12 @@
}
StringListAutocomplete.prototype.onBlur = function(ev) {
if ($(ev.relatedTarget).closest('ul.inspector-autocomplete').length > 0) {
// Do not close the autocomplete results if a drop-down
// menu item was clicked
return
}
this.removeAutocomplete(ev.currentTarget)
}

3
modules/system/assets/ui/storm-min.js vendored
View File

@ -4990,7 +4990,8 @@ this.removeAutocompleteFromAllRows()
this.items=null
BaseProto.onPopupHidden.call(this,ev,link,popup)}
StringListAutocomplete.prototype.onFocus=function(ev){this.setActiveCell(ev.currentTarget)}
StringListAutocomplete.prototype.onBlur=function(ev){this.removeAutocomplete(ev.currentTarget)}
StringListAutocomplete.prototype.onBlur=function(ev){if($(ev.relatedTarget).closest('ul.inspector-autocomplete').length>0){return}
this.removeAutocomplete(ev.currentTarget)}
StringListAutocomplete.prototype.onCommand=function(ev){var command=ev.currentTarget.getAttribute('data-cmd')
switch(command){case'create-item':this.createItem()
break;case'delete-item':this.deleteItem()