Bladeren bron

HPCC-9854 Enable prototyping in JSBin

Fixes HPCC-9854

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
Gordon Smith 12 jaren geleden
bovenliggende
commit
085a87af82
2 gewijzigde bestanden met toevoegingen van 10 en 5 verwijderingen
  1. 5 1
      esp/files/scripts/ESPRequest.js
  2. 5 4
      esp/files/scripts/ESPUtil.js

+ 5 - 1
esp/files/scripts/ESPRequest.js

@@ -37,7 +37,11 @@ define([
         },
 
         getParamFromURL: function (key) {
-            var value = dojo.queryToObject(dojo.doc.location.search.substr((dojo.doc.location.search.substr(0, 1) == "?" ? 1 : 0)))[key];
+            var value = "";
+            if (dojo.doc.location.search) {
+                var searchStr = dojo.doc.location.search.substr((dojo.doc.location.search.substr(0, 1) == "?" ? 1 : 0));
+                value = searchStr ? dojo.queryToObject(searchStr)[key] : "";
+            }
 
             if (value)
                 return value;

+ 5 - 4
esp/files/scripts/ESPUtil.js

@@ -17,9 +17,10 @@ define([
     "dojo/_base/declare",
     "dojo/_base/array",
     "dojo/Stateful",
+    "dojo/json",
 
     "dijit/registry"
-], function (declare, arrayUtil, Stateful,
+], function (declare, arrayUtil, Stateful, json,
     registry) {
 
     var SingletonData = declare([Stateful], {
@@ -53,9 +54,9 @@ define([
         updateData: function (response) {
             var changed = false;
             for (var key in response) {
-                var json = dojo.toJson(response[key]);
-                if (this._changedCache[key] !== json) {
-                    this._changedCache[key] = json;
+                var jsonStr = json.stringify(response[key]);
+                if (this._changedCache[key] !== jsonStr) {
+                    this._changedCache[key] = jsonStr;
                     this.set(key, response[key]);
                     changed = true;
                 }