Merge remote-tracking branch 'origin/candidate-5.0.0' into closedown-5.0.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

esp/src/eclwatch/GraphPageWidget.js

@@ -384,6 +384,7 @@ define([
                             }
                         },
                         onGetTimers: function (timers) {
+                            context.graphTimers = context.wu.getGraphTimers(context.GraphName);
                         }
                     });
                 });
@@ -420,7 +421,7 @@ define([
         },
 
         loadGraphFromXGMML: function (xgmml) {
-            if (this.global.loadXGMML(xgmml, false, this.wu.getGraphTimers(this.params.GraphName))) {
+            if (this.global.loadXGMML(xgmml, false, this.graphTimers)) {
                 this.global.setMessage("...");  //  Just in case it decides to render  ---
                 var initialSelection = [];
                 if (this.overview.depth.get("value") === -1) {
@@ -445,7 +446,7 @@ define([
         },
 
         mergeGraphFromXGMML: function (xgmml) {
-            if (this.global.loadXGMML(xgmml, true, this.wu.getGraphTimers(this.params.GraphName))) {
+            if (this.global.loadXGMML(xgmml, true, this.graphTimers)) {
                 this.global.setMessage("...");  //  Just in case it decides to render  ---
                 this.refreshOverviewXGMML();
                 this.refreshMainXGMML();

esp/src/eclwatch/GraphTreeWidget.js

@@ -391,6 +391,7 @@ define([
                             }
                         },
                         onGetTimers: function (timers) {
+                            context.graphTimers = context.wu.getGraphTimers(context.GraphName);
                         }
                     });
                 });
@@ -427,7 +428,7 @@ define([
         },
 
         loadGraphFromXGMML: function (xgmml) {
-            if (this.global.loadXGMML(xgmml, false, this.wu.getGraphTimers(this.params.GraphName))) {
+            if (this.global.loadXGMML(xgmml, false, this.graphTimers)) {
                 this.global.setMessage("...");  //  Just in case it decides to render  ---
                 var initialSelection = [];
                 this.setMainRootItems(initialSelection);
@@ -439,7 +440,7 @@ define([
         },
 
         mergeGraphFromXGMML: function (xgmml) {
-            if (this.global.loadXGMML(xgmml, true, this.wu.getGraphTimers(this.params.GraphName))) {
+            if (this.global.loadXGMML(xgmml, true, this.graphTimers)) {
                 this.global.setMessage("...");  //  Just in case it decides to render  ---
                 this.refreshMainXGMML();
                 this.loadSubgraphs();

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();

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>