Merge pull request #4592 from GordonSmith/HPCC-9621

HPCC-9621 IE8 + XP ECL Watch Issues

Reviewed-By: Miguel Vazquez <miguel.vazquez@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

esp/files/css/hpcc.css

@@ -764,3 +764,4 @@ margin-left:-20px;
     right: 0;
     height: auto;
 }
+

esp/files/scripts/ActivityWidget.js

@@ -32,19 +32,14 @@ define([
     "hpcc/ESPWorkunit",
     "hpcc/ESPDFUWorkunit",
     "hpcc/WsSMC",
-    "hpcc/WsWorkunits",
-    "hpcc/FileSpray",
-    "hpcc/WsDfu",
     "hpcc/WUDetailsWidget",
     "hpcc/DFUWUDetailsWidget",
-    "hpcc/LFDetailsWidget",
-    "hpcc/SFDetailsWidget",
     "hpcc/ESPUtil"
 
 ], function (declare, lang, arrayUtil, on,
                 Button,
                 OnDemandGrid, Keyboard, Selection, selector, ColumnResizer, DijitRegistry,
-                GridDetailsWidget, ESPWorkunit, ESPDFUWorkunit, WsSMC, WsWorkunits, FileSpray, WsDfu, WUDetailsWidget, DFUWUDetailsWidget, LFDetailsWidget, SFDetailsWidget, ESPUtil) {
+                GridDetailsWidget, ESPWorkunit, ESPDFUWorkunit, WsSMC, WUDetailsWidget, DFUWUDetailsWidget, ESPUtil) {
     return declare("ActivityWidget", [GridDetailsWidget], {
 
         gridTitle: "Activity",
@@ -76,7 +71,7 @@ define([
                         label: "Active workunit", width: 180, sortable: true,
                         formatter: function (Wuid, row) {
                             var wu = row.Server === "DFUserver" ? ESPDFUWorkunit.Get(Wuid) : ESPWorkunit.Get(Wuid);
-                            return "<img src='../files/" + wu.getStateImage() + "'>&nbsp<a href=# class='" + context.id + "WuidClick'>" + Wuid + "</a>";
+                            return "<img src='../files/" + wu.getStateImage() + "'>&nbsp;<a href='#' class='" + context.id + "WuidClick'>" + Wuid + "</a>";
                         }
 
                     },
@@ -87,7 +82,7 @@ define([
                         }
                     },
                     Owner: { label: "Owner", width: 90, sortable: true },
-                    Jobname: { label: "Job Name", sortable: true },
+                    Jobname: { label: "Job Name", sortable: true }
                 }
             }, domID);
 

esp/files/scripts/DFUQueryWidget.js

@@ -390,7 +390,7 @@ define([
                     },
                     Name: { label: "Logical Name",
                         formatter: function (name, idx) {
-                            return "<a href=# rowIndex=" + idx + " class='" + context.id + "LogicalNameClick'>" + name + "</a>";
+                            return "<a href='#' rowIndex=" + idx + " class='" + context.id + "LogicalNameClick'>" + name + "</a>";
                         }
                     },
                     Owner: { label: "Owner", width: 72 },

esp/files/scripts/ESPBase.js

@@ -20,7 +20,9 @@ define([
     return declare(null, {
 
         constructor: function (args) {
-            declare.safeMixin(this, args);
+            if (args) {
+                declare.safeMixin(this, args);
+            }
         },
 
         getParam: function (key) {

esp/files/scripts/ESPDFUWorkunit.js

@@ -135,7 +135,9 @@ define([
         },
         constructor: function (args) {
             this.inherited(arguments);
-            declare.safeMixin(this, args);
+            if (args) {
+                declare.safeMixin(this, args);
+            }
             this.wu = this;
         },
         isComplete: function () {

esp/files/scripts/ESPLogicalFile.js

@@ -72,7 +72,9 @@ define([
         },
         constructor: function (args) {
             this.inherited(arguments);
-            declare.safeMixin(this, args);
+            if (args) {
+                declare.safeMixin(this, args);
+            }
             this.logicalFile = this;
         },
         save: function (description, args) {

esp/files/scripts/ESPRequest.js

@@ -30,7 +30,9 @@ define([
         serverIP: null,
 
         constructor: function (args) {
-            declare.safeMixin(this, args);
+            if (args) {
+                declare.safeMixin(this, args);
+            }
             this.serverIP = this.getParamFromURL("ServerIP");
         },
 
@@ -262,7 +264,9 @@ define([
                 if (!this.idProperty) {
                     throw new Error("idProperty:  Undefined - Missing ID field (eg 'Wuid').");
                 }
-                declare.safeMixin(this, options);
+                if (options) {
+                    declare.safeMixin(this, options);
+                }
             },
 
             getIdentity: function (item) {
@@ -360,6 +364,7 @@ define([
                         context.postProcessResults(items);
                     }
                     deferredResults.resolve(items);
+                    return items;
                 });
 
                 return QueryResults(deferredResults);

esp/files/scripts/ESPResult.js

@@ -76,7 +76,9 @@ define([
         Total: "-1",
 
         constructor: function (args) {
-            declare.safeMixin(this, args);
+            if (args) {
+                declare.safeMixin(this, args);
+            }
             if (lang.exists("Sequence", this)) {
                 this.store = new Store({
                     wuid: this.Wuid,

esp/files/scripts/ESPUtil.js

@@ -18,7 +18,7 @@ define([
     "dojo/_base/array",
     "dojo/Stateful",
 
-    "dijit/registry",
+    "dijit/registry"
 ], function (declare, arrayUtil, Stateful,
     registry) {
 

esp/files/scripts/ESPWorkunit.js

@@ -128,7 +128,9 @@ define([
         },
         constructor: function (args) {
             this.inherited(arguments);
-            declare.safeMixin(this, args);
+            if (args) {
+                declare.safeMixin(this, args);
+            }
             this.wu = this;
         },
         isComplete: function () {

esp/files/scripts/FileSpray.js

@@ -122,7 +122,9 @@ define([
         responseQualifier: "DropZoneFilesResponse.DropZones.DropZone",
         idProperty: "calculatedID",
         constructor: function (options) {
-            declare.safeMixin(this, options);
+            if (options) {
+                declare.safeMixin(this, options);
+            }
         },
         preProcessRow: function (row) {
             lang.mixin(row, {

esp/files/scripts/GetDFUWorkunitsWidget.js

@@ -360,7 +360,7 @@ define([
                         width: 180,
                         formatter: function (ID, idx) {
                             var wu = ESPDFUWorkunit.Get(ID);
-                            return "<img src='../files/" + wu.getStateImage() + "'>&nbsp<a href=# rowIndex=" + idx + " class='" + context.id + "IDClick'>" + ID + "</a>";
+                            return "<img src='../files/" + wu.getStateImage() + "'>&nbsp;<a href='#' rowIndex=" + idx + " class='" + context.id + "IDClick'>" + ID + "</a>";
                         }
                     },
                     Command: {

esp/files/scripts/GraphsWidget.js

@@ -83,7 +83,7 @@ define([
                     Name: {
                         label: "Name", width: 72, sortable: true,
                         formatter: function (Name, idx) {
-                            return "<a href=# rowIndex=" + idx + " class='" + context.id + "GraphClick'>" + Name + "</a>";
+                            return "<a href='#' rowIndex=" + idx + " class='" + context.id + "GraphClick'>" + Name + "</a>";
                         }
                     },
                     Label: { label: "Label", sortable: true },

esp/files/scripts/HPCCPlatformWidget.js

@@ -15,6 +15,7 @@
 ############################################################################## */
 define([
     "dojo/_base/declare",
+    "dojo/_base/lang",
     "dojo/dom",
 
     "dijit/_TemplatedMixin",
@@ -47,7 +48,7 @@ define([
     "hpcc/HPCCPlatformRoxieWidget",
     "hpcc/HPCCPlatformOpsWidget"
 
-], function (declare, dom,
+], function (declare, lang, dom,
                 _TemplatedMixin, _WidgetsInTemplateMixin, registry, Tooltip,
                 _TabContainerWidget, ESPRequest, WsAccount,
                 template) {
@@ -102,7 +103,9 @@ define([
             var context = this;
             WsAccount.MyAccount({
             }).then(function (response) {
-                dom.byId(context.id + "UserID").innerHTML = response.MyAccountResponse.username;
+                if (lang.exists("MyAccountResponse.username", response)) {
+                    dom.byId(context.id + "UserID").innerHTML = response.MyAccountResponse.username;
+                }
             },
             function (error) {
             });

esp/files/scripts/LZBrowseWidget.js

@@ -355,7 +355,7 @@ define([
                             } else {
                                 img += "file.png";
                             }
-                            return "<img src='" + img + "'/>&nbsp" + name;
+                            return "<img src='" + img + "'/>&nbsp;" + name;
                         }
                     }),
                     filesize: { label: "Size", width: 108 },

esp/files/scripts/ResultWidget.js

@@ -39,6 +39,7 @@ define([
     "dojo/text!../templates/ResultWidget.html",
 
     "dijit/layout/BorderContainer",
+    "dijit/layout/ContentPane",
     "dijit/Toolbar",
     "dijit/form/Button",
     "dijit/ToolbarSeparator"

esp/files/scripts/ResultsWidget.js

@@ -79,13 +79,13 @@ define([
                     Name: {
                         label: "Name", width: 180, sortable: true,
                         formatter: function (Name, idx) {
-                            return "<a href=# rowIndex=" + idx + " class='" + context.id + "ResultClick'>" + Name + "</a>";
+                            return "<a href='#' rowIndex=" + idx + " class='" + context.id + "ResultClick'>" + Name + "</a>";
                         }
                     },
                     FileName: {
                         label: "FileName", sortable: true,
                         formatter: function (FileName, idx) {
-                            return "<a href=# rowIndex=" + idx + " class='" + context.id + "FileClick'>" + FileName + "</a>";
+                            return "<a href='#' rowIndex=" + idx + " class='" + context.id + "FileClick'>" + FileName + "</a>";
                         }
                     },
                     Value: { label: "Value", width: 360, sortable: true }

esp/files/scripts/SampleSelectControl.js

@@ -28,7 +28,9 @@ define([
         },
 
         constructor: function (args) {
-            declare.safeMixin(this, args);
+            if (args) {
+                declare.safeMixin(this, args);
+            }
             var sampleStore = new dojo.data.ItemFileReadStore({
                 url: this.samplesURL
             });

esp/files/scripts/SearchResultsWidget.js

@@ -76,7 +76,7 @@ define([
                     Summary: {
                         label: "Who", sortable: true,
                         formatter: function (summary, idx) {
-                            return "<a href=# rowIndex=" + idx + " class='" + context.id + "SearchResultClick'>" + summary + "</a>";
+                            return "<a href='#' rowIndex=" + idx + " class='" + context.id + "SearchResultClick'>" + summary + "</a>";
                         }
                     }
                 }

esp/files/scripts/SourceFilesWidget.js

@@ -74,7 +74,7 @@ define([
                     Name: {
                         label: "Name", sortable: true,
                         formatter: function (Name, row) {
-                            return "<img src='../files/img/" + (row.IsSuperFile ? "folder_table.png" : "file.png") + "'>&nbsp<a href=# rowIndex=" + row + " class='" + context.id + "SourceFileClick'>" + Name + "</a>";
+                            return "<img src='../files/img/" + (row.IsSuperFile ? "folder_table.png" : "file.png") + "'>&nbsp;<a href='#' rowIndex=" + row + " class='" + context.id + "SourceFileClick'>" + Name + "</a>";
                         }
                     },
                     Count: { label: "Usage", width: 72, sortable: true }

esp/files/scripts/WUQueryWidget.js

@@ -400,7 +400,7 @@ define([
                         label: "Wuid", width: 180,
                         formatter: function (Wuid, idx) {
                             var wu = ESPWorkunit.Get(Wuid);
-                            return "<img src='../files/" + wu.getStateImage() + "'>&nbsp<a href=# rowIndex=" + idx + " class='" + context.id + "WuidClick'>" + Wuid + "</a>";
+                            return "<img src='../files/" + wu.getStateImage() + "'>&nbsp;<a href='#' rowIndex=" + idx + " class='" + context.id + "WuidClick'>" + Wuid + "</a>";
                         }
                     },
                     Owner: { label: "Owner", width: 90 },

esp/files/scripts/WsAccount.js

@@ -28,8 +28,7 @@ define([
 
         MyAccount: function (params) {
             return ESPRequest.send("ws_account", "MyAccount", params);
-        },
-
+        }
     };
 });
 

esp/files/scripts/WsSMC.js

@@ -61,8 +61,7 @@ define([
 
         Activity: function (params) {
             return ESPRequest.send("WsSMC", "Activity", params);
-        },
-
+        }
     };
 });
 

esp/files/templates/DFUWUDetailsWidget.html

@@ -16,7 +16,7 @@
                 </div>
                 <div data-dojo-props="region: 'center'" data-dojo-type="dijit.layout.ContentPane">
                         <h2>
-                            <img id="${id}ProtectedImage" src="img/locked.png" />&nbsp<img id="${id}StateIdImage" src="img/workunit.png" />&nbsp<span id="${id}Wuid" class="bold">WUID</span>&nbsp<span id="${id}CommandMessage2" class="bold">Command</span>
+                            <img id="${id}ProtectedImage" src="img/locked.png" />&nbsp;<img id="${id}StateIdImage" src="img/workunit.png" />&nbsp<span id="${id}Wuid" class="bold">WUID</span>&nbsp<span id="${id}CommandMessage2" class="bold">Command</span>
                         </h2>
                         <form>
                             <ul>

esp/files/templates/HPCCPlatformOpsWidget.html

@@ -4,18 +4,18 @@
             <div id="${id}StackController" style="width: 100%" data-dojo-props="containerId:'${id}TabContainer'" data-dojo-type="dijit.layout.StackController"></div>
         </div>
         <div id="${id}TabContainer" data-dojo-props="region: 'center', tabPosition: 'top'" style="width: 100%; height: 100%" data-dojo-type="dijit.layout.StackContainer">
-            <div id="${id}_Users" title="Users" data-dojo-type="dijit.layout.ContentPane">
-            </div>
-            <div id="${id}_Groups" title="Groups" data-dojo-type="dijit.layout.ContentPane">
-            </div>
-            <div id="${id}_Permissions" title="Permissions" data-dojo-type="dijit.layout.ContentPane">
-            </div>
             <div id="${id}_TargetClusters" title="Target Clusters" data-dojo-type="dijit.layout.ContentPane">
             </div>
             <div id="${id}_ClusterProcesses" title="Cluster Processes" data-dojo-type="dijit.layout.ContentPane">
             </div>
             <div id="${id}_SystemServers" title="System Servers" data-dojo-type="dijit.layout.ContentPane">
             </div>
+            <div id="${id}_Users" title="Users" data-dojo-type="dijit.layout.ContentPane">
+            </div>
+            <div id="${id}_Groups" title="Groups" data-dojo-type="dijit.layout.ContentPane">
+            </div>
+            <div id="${id}_Permissions" title="Permissions" data-dojo-type="dijit.layout.ContentPane">
+            </div>
             <div id="${id}_Resources" title="Resources" data-dojo-type="dijit.layout.ContentPane">
             </div>
         </div>

esp/files/templates/LFDetailsWidget.html

@@ -74,7 +74,7 @@
                 </div>
                 <div data-dojo-props="region: 'center'" data-dojo-type="dijit.layout.ContentPane">
                     <h2>
-                        <img class="iconAlign" src="img/folder_table.png" />&nbsp<span id="${id}Name" class="bold"></span>
+                        <img class="iconAlign" src="img/folder_table.png" />&nbsp;<span id="${id}Name" class="bold"></span>
                     </h2>
                     <form id="${id}SummaryForm" class="leftAlignFields">
                         <ul>

esp/files/templates/SFDetailsWidget.html

@@ -10,7 +10,7 @@
                  </div>
                 <div data-dojo-props="region: 'center'" data-dojo-type="dijit.layout.ContentPane">
                     <h2>
-                        <img class="iconAlign" src="img/folder_table.png" />&nbsp<span id="${id}Name" class="bold"></span>
+                        <img class="iconAlign" src="img/folder_table.png" />&nbsp;<span id="${id}Name" class="bold"></span>
                     </h2>
                     <form id="${id}SummaryForm">
                         <ul>

esp/files/templates/WUDetailsWidget.html

@@ -27,7 +27,7 @@
                 </div>
                 <div data-dojo-props="region: 'center'" data-dojo-type="dijit.layout.ContentPane">
                     <h2>
-                        <img id="${id}ProtectedImage" src="img/locked.png"/>&nbsp<div id="${id}StateIdImage" class="iconWorkunit" ></div>&nbsp<span id="${id}Wuid" class="bold">WUID</span>
+                        <img id="${id}ProtectedImage" src="img/locked.png"/>&nbsp;<div id="${id}StateIdImage" class="iconWorkunit" ></div>&nbsp<span id="${id}Wuid" class="bold">WUID</span>
                     </h2>
                     <form id="${id}SummaryForm">
                         <ul>