Skip to content

Commit

Permalink
hotfix scene bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
kimorkim committed Jan 28, 2016
1 parent d792bf8 commit 4b7e148
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions dist/entry.js
Original file line number Diff line number Diff line change
Expand Up @@ -9885,8 +9885,8 @@ Entry.Scene.prototype.removeScene = function(a) {
};
Entry.Scene.prototype.selectScene = function(a) {
a = a || this.getScenes()[0];
this.selectedScene && this.selectedScene.id == a.id || (Entry.engine.isState("run") && Entry.container.resetSceneDuringRun(), this.selectedScene = a, Entry.container.setCurrentObjects(), Entry.stage.objectContainers && 0 !== Entry.stage.objectContainers.length && Entry.stage.selectObjectContainer(a), (a = Entry.container.getCurrentObjects()[0]) && "minimize" != Entry.type ? (Entry.container.selectObject(a.id), Entry.playground.refreshPlayground()) : (Entry.stage.selectObject(null), Entry.playground.flushPlayground(),
Entry.variableContainer.updateList()), Entry.container.listView_ || Entry.stage.sortZorder(), Entry.container.updateListView(), this.updateView());
this.selectedScene && this.selectedScene.id == a.id || (Entry.engine.isState("run") && Entry.container.resetSceneDuringRun(), this.selectedScene = a, Entry.container.setCurrentObjects(), Entry.stage.objectContainers && 0 !== Entry.stage.objectContainers.length && Entry.stage.selectObjectContainer(a), (a = Entry.container.getCurrentObjects()[0]) && "minimize" != Entry.type ? Entry.container.selectObject(a.id) : (Entry.stage.selectObject(null), Entry.playground.flushPlayground(), Entry.variableContainer.updateList()),
Entry.container.listView_ || Entry.stage.sortZorder(), Entry.container.updateListView(), this.updateView());
};
Entry.Scene.prototype.toJSON = function() {
for (var a = [], b = this.getScenes().length, c = 0;c < b;c++) {
Expand Down
8 changes: 4 additions & 4 deletions dist/entry.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/scene.js
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ Entry.Scene.prototype.selectScene = function(scene) {
var targetObject = Entry.container.getCurrentObjects()[0];
if (targetObject && Entry.type != 'minimize') {
Entry.container.selectObject(targetObject.id);
Entry.playground.refreshPlayground();
}
else {
Entry.stage.selectObject(null);
Expand Down

0 comments on commit 4b7e148

Please sign in to comment.