Merge pull request #5018 from GordonSmith/IE8

HPCC-10241 New ECL Watch + IE8 

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

esp/files/scripts/ESPWorkunit.js

@@ -224,7 +224,7 @@ define([
             } else {
                 WsTopology.TpLogicalClusterQuery().then(function (response) {
                     if (lang.exists("TpLogicalClusterQueryResponse.default", response)) {
-                        deferred.resolve(response.TpLogicalClusterQueryResponse.default.Name);
+                        deferred.resolve(response.TpLogicalClusterQueryResponse["default"].Name);
                     }
                 });
             }

esp/files/scripts/InfoGridWidget.js

@@ -28,7 +28,6 @@ define([
     "dijit/registry",
 
     "dojox/data/AndOrReadStore",
-    "dojox/gfx",
     "dojox/html/entities",
 
     "dgrid/OnDemandGrid",
@@ -49,7 +48,7 @@ define([
 ],
     function (declare, lang, arrayUtil, dom, domConstruct, domClass, Memory, Observable, topic,
             registry, 
-            AndOrReadStore, gfx, entities,
+            AndOrReadStore, entities,
             OnDemandGrid, Keyboard, Selection, ColumnResizer, DijitRegistry,
             _Widget, ESPUtil, ESPWorkunit,
             template) {
@@ -132,20 +131,14 @@ define([
 
                     var target = dom.byId("stubMore");
                     if (target) {
-                        var newTarget = domConstruct.create("div", {
+                        this.errWarnCount = domConstruct.create("div", {
                             style: {
                                 position: "relative",
                                 top: "16px",
-                                left: "12px"
+                                left: "12px",
+                                color: "white"
                             }
                         }, target.firstChild);
-                        var surface = gfx.createSurface(newTarget, 16, 16);
-                        this.errWarnCount = surface.createText({ x: 8, y: 12, align: "middle", text: "" })
-                                    .setFill([255, 255, 255, 1])
-                        ;
-                        this.errWarnCount.setFont({
-                            size: "12px"
-                        });
                     }
                 }
             },
@@ -287,10 +280,10 @@ define([
 
                 this.refreshFilter();
                 if (this.errWarnCount) {
-                    this.errWarnCount.rawNode.textContent = this.infoData.length;
-                    if (this.errWarnMenuItem) {
-                        this.errWarnMenuItem.set("label", "Error/Warnings (" + this.infoData.length + ")");
-                    }
+                    this.errWarnCount.innerHTML = this.infoData.length;
+                }
+                if (this.errWarnMenuItem) {
+                    this.errWarnMenuItem.set("label", "Error/Warnings (" + this.infoData.length + ")");
                 }
             }
         });

esp/files/scripts/TargetSelectWidget.js

@@ -20,7 +20,6 @@ require([
     "dojo/_base/xhr",
     "dojo/data/ItemFileReadStore",
     "dojo/on",
-    "dojo/dom",
 
     "dijit/form/Select",
     "dijit/registry",
@@ -28,10 +27,10 @@ require([
     "hpcc/WsTopology",
     "hpcc/WsWorkunits",
     "hpcc/FileSpray"
-], function (declare, lang, arrayUtil, xhr, ItemFileReadStore, on, dom,
+], function (declare, lang, arrayUtil, xhr, ItemFileReadStore, on,
     Select, registry,
     WsTopology, WsWorkunits, FileSpray) {
-    return declare("TargetSelectWidget", Select, {
+    return declare("TargetSelectWidget", [Select], {
 
         loading: false,
         defaultValue: "",
@@ -195,8 +194,8 @@ require([
                     }
 
                     if (!context.includeBlank && context._value == "") {
-                        if (response.TpLogicalClusterQueryResponse.default) {
-                            context._value = response.TpLogicalClusterQueryResponse.default.Name;
+                        if (response.TpLogicalClusterQueryResponse["default"]) {
+                            context._value = response.TpLogicalClusterQueryResponse["default"].Name;
                         } else {
                             context._value = context.options[0].value;
                         }

esp/files/scripts/WsTopology.js

@@ -54,11 +54,11 @@ define([
                     });
                 }
                 if (hthor) {
-                    response.TpLogicalClusterQueryResponse.default = hthor;
+                    response.TpLogicalClusterQueryResponse["default"] = hthor;
                 } else if (best) {
-                    response.TpLogicalClusterQueryResponse.default = best;
+                    response.TpLogicalClusterQueryResponse["default"] = best;
                 } else {
-                    response.TpLogicalClusterQueryResponse.default = null;
+                    response.TpLogicalClusterQueryResponse["default"] = null;
                 }
                 return response;
             });

esp/files/templates/HPCCPlatformRoxieWidget.html

@@ -6,8 +6,8 @@
         <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}_Queries" title="Queries" data-dojo-type="QuerySetQueryWidget">
             </div>
-            <div id="${id}_PackageMaps" title="Package Maps" data-dojo-type="PackageMapQueryWidget">
-            </div>
+            <!--div id="${id}_PackageMaps" title="Package Maps" data-dojo-type="PackageMapQueryWidget">
+            </div-->
         </div>
     </div>
 </div>