@smartface/smartface.updater
Advanced tools
Comparing version 6.4.6 to 6.4.7
@@ -9,13 +9,3 @@ define(function(require, exports, module) { | ||
var idMap = (function() { | ||
var _idMap = {}; | ||
return { | ||
get: function(key) { | ||
return _idMap[key]; | ||
}, | ||
set: function(key, value) { | ||
_idMap[key] = value; | ||
} | ||
}; | ||
})(); | ||
var idMap = {}; | ||
@@ -97,11 +87,7 @@ var listViewDefault = require("text!./listViewDefault.json"); | ||
var newID = guid(); | ||
component.id = newID; | ||
idMap.set(oldID, newID); | ||
component.id = idMap[oldID] = newID; | ||
}); | ||
components.forEach(function(c) { | ||
if (c.source && c.source.id) { | ||
// TODO: Remove | ||
if (!idMap.get(c.source.id)) | ||
debugger; | ||
c.source.id = idMap.get(c.source.id); | ||
c.source.id = idMap[c.source.id]; | ||
} | ||
@@ -108,0 +94,0 @@ }); |
@@ -6,5 +6,7 @@ define(function(require, exports, module) { | ||
const LIB_NAME = "__library__"; | ||
const LIB_PATH = PGX_PATH + LIB_NAME + ".pgx"; | ||
const PGX_EXTENSION = ".pgx"; | ||
const LIB_PATH = PGX_PATH + LIB_NAME + PGX_EXTENSION; | ||
var path = require("path"); | ||
var versions = require("./versions"); | ||
@@ -51,18 +53,23 @@ /** | ||
self.fs.readdir(PGX_PATH, function(err, list) { | ||
if (err) { | ||
callback(err); | ||
if (err || !list || list.length === 0) { | ||
callback(err || "An error occurred"); | ||
} | ||
else { | ||
list = list || []; | ||
var taskCount = list.length; | ||
list.forEach(function(file) { | ||
self.updatePage(file.name, function(err) { | ||
if (err) { | ||
callback(err); | ||
} | ||
if (--taskCount === 0) { | ||
callback(); | ||
} | ||
}); | ||
}); | ||
var updateChain = function(pageNameList) { | ||
if (pageNameList.length === 0) { | ||
callback(); | ||
} | ||
else { | ||
self.updatePage(pageNameList[0], function(err) { | ||
if (err) { | ||
callback(err); | ||
} | ||
else { | ||
pageNameList.shift(); | ||
updateChain(pageNameList); | ||
} | ||
}); | ||
} | ||
}; | ||
updateChain(getPageNamesFromList(list)); | ||
} | ||
@@ -72,2 +79,13 @@ }); | ||
function getPageNamesFromList(list) { | ||
var library = LIB_NAME + PGX_EXTENSION; | ||
var newList = [library]; | ||
list.forEach(function(e) { | ||
if (e.name !== library) { | ||
newList.push(e.name); | ||
} | ||
}); | ||
return newList; | ||
} | ||
/** | ||
@@ -84,3 +102,2 @@ * @callback updatePageCallback | ||
var self = this; | ||
var versions = self.versions; | ||
var pagePath = path.join(PGX_PATH, pageName); | ||
@@ -146,3 +163,3 @@ self.fs.readFile(pagePath, function(err, content) { | ||
function AutoUpdatePages(modules, versions, editorVersion) { | ||
function AutoUpdatePages(modules, editorVersion) { | ||
this.fs = modules.fs; | ||
@@ -152,3 +169,2 @@ this.tabManager = modules.tabManager; | ||
this.dotObject = modules.dotObject; | ||
this.versions = versions; | ||
this.editorVersion = editorVersion; | ||
@@ -155,0 +171,0 @@ } |
{ | ||
"name": "@smartface/smartface.updater", | ||
"version": "6.4.6", | ||
"version": "6.4.7", | ||
"description": "SmartfaceCloud Updater plugin", | ||
@@ -5,0 +5,0 @@ "main": "smf.updater.js", |
@@ -50,3 +50,3 @@ define(function(require, exports, module) { | ||
tabManager: tabManager | ||
}, versions, editorVersion); | ||
}, editorVersion); | ||
@@ -53,0 +53,0 @@ autoUpdatePages.isUpdateRequired(function(shouldUpdate) { |
34089
941