Переглянути джерело

Merge pull request #6224 from GordonSmith/HPCC-11895

HPCC-11895 ECL Playgrounds toolbar is wrapping to two lines

Reviewed-By: Miguel Vazquez <miguel.vazquez@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 11 роки тому
батько
коміт
016f5a87b3

+ 3 - 0
esp/src/eclwatch/GraphWidget.js

@@ -480,6 +480,7 @@ define([
                 this.previous = registry.byId(this.id + "Previous");
                 this.depth = registry.byId(this.id + "Depth");
                 this.distance = registry.byId(this.id + "Distance");
+                this.syncSelectionSplitter = registry.byId(this.id + "SyncSelectionSplitter");
                 this.syncSelection = registry.byId(this.id + "SyncSelection");
             },
 
@@ -543,8 +544,10 @@ define([
 
             showSyncSelection: function (show) {
                 if (show) {
+                    domStyle.set(this.syncSelectionSplitter.domNode, 'display', 'block');
                     domStyle.set(this.syncSelection.domNode, 'display', 'block');
                 } else {
+                    domStyle.set(this.syncSelectionSplitter.domNode, 'display', 'none');
                     domStyle.set(this.syncSelection.domNode, 'display', 'none');
                 }
                 this.resize();

+ 1 - 1
esp/src/eclwatch/templates/GraphWidget.html

@@ -15,7 +15,7 @@
                 <input id="${id}Depth" style="width: 60px" value="2" title="${i18n.Depth}" data-dojo-attach-event="onChange:_onDepthChange" data-dojo-props="placeHolder:'${i18n.Depth}', intermediateChanges:true, constraints:{min:0,max:1000}" data-dojo-type="dijit.form.NumberSpinner" />
                 <div id="${id}DistanceLabel" title="${i18n.Distance}" data-dojo-props="iconClass:'iconDistance', showLabel:false, disabled: true" data-dojo-type="dijit.form.Button"></div>
                 <input id="${id}Distance" style="width: 60px" value="2" title="${i18n.Distance}" data-dojo-attach-event="onChange:_onDistanceChange" data-dojo-props="placeHolder:'${i18n.Depth}', intermediateChanges:true, constraints:{min:0,max:1000}" data-dojo-type="dijit.form.NumberSpinner" />
-                <span data-dojo-type="dijit.ToolbarSeparator"></span>
+                <span id="${id}SyncSelectionSplitter" data-dojo-type="dijit.ToolbarSeparator"></span>
                 <div id="${id}SyncSelection" data-dojo-attach-event="onClick:_onSyncSelection" data-dojo-props="iconClass:'iconSync', showLabel:false" data-dojo-type="dijit.form.Button">${i18n.SyncSelection}</div>
             </div>
         </div>