From 2df22fda8375f85e58a4dd25c71718103027b0be Mon Sep 17 00:00:00 2001 From: alekseybobkov Date: Fri, 13 Nov 2015 14:41:49 -0800 Subject: [PATCH] Minor improvements in the Inspector API --- .../system/assets/ui/js/inspector.editor.autocomplete.js | 3 ++- modules/system/assets/ui/js/inspector.editor.dropdown.js | 3 ++- modules/system/assets/ui/less/inspector.less | 6 ++++++ modules/system/assets/ui/storm-min.js | 4 ++-- modules/system/assets/ui/storm.css | 1 + 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/modules/system/assets/ui/js/inspector.editor.autocomplete.js b/modules/system/assets/ui/js/inspector.editor.autocomplete.js index c80524cce..574c2ed3c 100644 --- a/modules/system/assets/ui/js/inspector.editor.autocomplete.js +++ b/modules/system/assets/ui/js/inspector.editor.autocomplete.js @@ -164,7 +164,8 @@ $inspectable.trigger(itemsEvent, [{ values: values, callback: this.proxy(this.itemsRequestDone), - property: this.inspector.getPropertyPath(this.propertyDefinition.property) + property: this.inspector.getPropertyPath(this.propertyDefinition.property), + propertyDefinition: this.propertyDefinition }]) if (itemsEvent.isDefaultPrevented()) { diff --git a/modules/system/assets/ui/js/inspector.editor.dropdown.js b/modules/system/assets/ui/js/inspector.editor.dropdown.js index 776ec0408..40711de8c 100644 --- a/modules/system/assets/ui/js/inspector.editor.dropdown.js +++ b/modules/system/assets/ui/js/inspector.editor.dropdown.js @@ -313,7 +313,8 @@ $inspectable.trigger(optionsEvent, [{ values: values, callback: callback, - property: this.inspector.getPropertyPath(this.propertyDefinition.property) + property: this.inspector.getPropertyPath(this.propertyDefinition.property), + propertyDefinition: this.propertyDefinition }]) if (optionsEvent.isDefaultPrevented()) { diff --git a/modules/system/assets/ui/less/inspector.less b/modules/system/assets/ui/less/inspector.less index 24644b0a6..e7e6316d9 100644 --- a/modules/system/assets/ui/less/inspector.less +++ b/modules/system/assets/ui/less/inspector.less @@ -471,6 +471,12 @@ div.control-popover { } } +html.gecko.mac { + .scroll-wrapper.inspector-wrapper > div { + margin-right: 17px; + } +} + .inspector-table-list { border-top: 1px solid #e2e2e2; .user-select(none); diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js index dc5601a8a..baddd3abd 100644 --- a/modules/system/assets/ui/storm-min.js +++ b/modules/system/assets/ui/storm-min.js @@ -4262,7 +4262,7 @@ $form.request('onInspectableGetOptions',{data:data,}).done(callback).always(this DropdownEditor.prototype.triggerGetOptions=function(values,callback){var $inspectable=this.getInspectableElement() if(!$inspectable){return true} var optionsEvent=$.Event('dropdownoptions.oc.inspector') -$inspectable.trigger(optionsEvent,[{values:values,callback:callback,property:this.inspector.getPropertyPath(this.propertyDefinition.property)}]) +$inspectable.trigger(optionsEvent,[{values:values,callback:callback,property:this.inspector.getPropertyPath(this.propertyDefinition.property),propertyDefinition:this.propertyDefinition}]) if(optionsEvent.isDefaultPrevented()){return false} return true} DropdownEditor.prototype.saveDependencyValues=function(){this.prevDependencyValues=this.getDependencyValues()} @@ -5018,7 +5018,7 @@ $form.request('onInspectableGetOptions',{data:data,}).done(this.proxy(this.items AutocompleteEditor.prototype.triggerGetItems=function(values){var $inspectable=this.getInspectableElement() if(!$inspectable){return true} var itemsEvent=$.Event('autocompleteitems.oc.inspector') -$inspectable.trigger(itemsEvent,[{values:values,callback:this.proxy(this.itemsRequestDone),property:this.inspector.getPropertyPath(this.propertyDefinition.property)}]) +$inspectable.trigger(itemsEvent,[{values:values,callback:this.proxy(this.itemsRequestDone),property:this.inspector.getPropertyPath(this.propertyDefinition.property),propertyDefinition:this.propertyDefinition}]) if(itemsEvent.isDefaultPrevented()){return false} return true} AutocompleteEditor.prototype.itemsRequestDone=function(data){if(this.isDisposed()){return} diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css index 5906bb67c..4eed85489 100644 --- a/modules/system/assets/ui/storm.css +++ b/modules/system/assets/ui/storm.css @@ -2506,6 +2506,7 @@ div.control-popover.inspector-temporary-placement{visibility:hidden;left:0 !impo .inspector-columns-editor .items-column{width:250px} .inspector-columns-editor .inspector-wrapper{background:#f2f2f2;border-left:2px solid #bdc3c7} .inspector-columns-editor .toolbar{padding:20px} +html.gecko.mac .scroll-wrapper.inspector-wrapper > div{margin-right:17px} .inspector-table-list{border-top:1px solid #e2e2e2;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} div.inspector-dictionary-container{border:1px solid #e0e0e0} div.inspector-dictionary-container .values{height:300px}