Merge branch 'master' of https://github.com/Esri/application-base-js

Esri · Oct 4, 2019 · 002147e · 002147e
2 parents 5927fa5 + e42396d
commit 002147e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/support/itemUtils.js b/support/itemUtils.js
diff --git a/support/itemUtils.js.map b/support/itemUtils.js.map
diff --git a/support/itemUtils.ts b/support/itemUtils.ts
@@ -118,7 +118,9 @@ export function createWebMapFromItem(
       portalItem: item
     });
     return wm.load().then(() => {
-      return _updateProxiedLayers(wm, appProxies);
+      return wm.basemap.load().then(() => {
+        return _updateProxiedLayers(wm, appProxies);
+      });
     });
   });
 }
@@ -132,7 +134,9 @@ export function createWebSceneFromItem(
       portalItem: item
     });
     return ws.load().then(() => {
-      return _updateProxiedLayers(ws, appProxies);
+      return ws.basemap.load().then(() => {
+        return _updateProxiedLayers(ws, appProxies);
+      });
     });
   });
 }
@@ -197,7 +201,7 @@ function _updateProxiedLayers(
   }
 
   appProxies.forEach(proxy => {
-    webItem.layers.forEach((layer: any) => {
+    webItem.allLayers.forEach((layer: any) => {
       if (layer.url === proxy.sourceUrl) {
         layer.url = proxy.proxyUrl;
       }