Skip to content

Commit 3525eea

Browse files
authored
Merge pull request #102 from lyonx/master
fix bug when loading all plugins on default data
2 parents c2672c3 + ef061f4 commit 3525eea

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

control/content/content.controller.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,11 @@
146146
}
147147
if (newObj.default) {
148148
var instanceIds = newObj._buildfire.plugins.data;
149+
var loadAllPlugins = newObj.content.loadAllPlugins;
150+
149151
newObj = Utility.getDefaultScopeBlankData();
152+
newObj.content.loadAllPlugins = loadAllPlugins;
153+
150154
newObj._buildfire.plugins.data = instanceIds;
151155
if (tmpCarousalData) {
152156
editor.loadItems(tmpCarousalData);

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"scripts": {
77
"start": "gulp build",
88
"postinstall": "./node_modules/.bin/bower install",
9-
"test": "./node_modules/.bin/karma start karma.conf.js"
9+
"test": "./node_modules/.bin/karma start karma.conf.js",
10+
"build": "gulp build && cd .. && rm -rf folderPlugin.zip && zip -r folderPlugin.zip folderPlugin_release/"
1011
},
1112
"dependencies": {
1213
"bower": "^1.5.3",

widget/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@
212212

213213
function loadData(err, obj) {
214214
if (err) return;
215+
if (!obj.data.design) return;
215216
layout = obj.data.design.selectedLayout;
216217

217218
if(!obj.data.design.securedFeaturesOption)

0 commit comments

Comments
 (0)