Use JSON.parse in AssetManager only if the value is a string. Closes #…

…128
GrapesJS · Jul 5, 2017 · 5f5ba1a · 5f5ba1a
1 parent 2c7de13
commit 5f5ba1a
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/asset_manager/index.js b/src/asset_manager/index.js
@@ -179,11 +179,13 @@ module.exports = () => {
       var name = this.storageKey;
       if(!d && c.stm)
         d = c.stm.load(name);
-      var assets = [];
+      var assets = d[name] || [];
 
-      try{
-        assets = JSON.parse(d[name]);
-      }catch(err){}
+      if (typeof assets == 'string') {
+        try {
+          assets = JSON.parse(d[name]);
+        } catch(err) {}
+      }
 
       if (assets && assets.length) {
         this.getAll().reset(assets);