Fix App activation calls, fix block insertion animations
This commit is contained in:
@@ -377,7 +377,7 @@ define([
|
||||
},
|
||||
});
|
||||
|
||||
App.on('before:start', function() {
|
||||
App.on('before:start', function(App, options) {
|
||||
App.registerBlockType('automatedLatestContent', {
|
||||
blockModel: Module.AutomatedLatestContentBlockModel,
|
||||
blockView: Module.AutomatedLatestContentBlockView,
|
||||
@@ -390,7 +390,7 @@ define([
|
||||
});
|
||||
});
|
||||
|
||||
App.on('start', function() {
|
||||
App.on('start', function(App, options) {
|
||||
App._ALCSupervisor = new Module.ALCSupervisor();
|
||||
App._ALCSupervisor.refresh();
|
||||
});
|
||||
|
@@ -94,8 +94,8 @@ define([
|
||||
},
|
||||
initialize: function() {
|
||||
this.on('showSettings', this.showSettings, this);
|
||||
//this.on('dom:refresh', this.showBlock, this);
|
||||
//this._isFirstRender = true;
|
||||
this.on('dom:refresh', this.showBlock, this);
|
||||
this._isFirstRender = true;
|
||||
},
|
||||
showTools: function(_event) {
|
||||
if (!this.showingToolsDisabled) {
|
||||
@@ -125,12 +125,12 @@ define([
|
||||
return this.model.clone();
|
||||
}.bind(this);
|
||||
},
|
||||
//showBlock: function() {
|
||||
//if (this._isFirstRender) {
|
||||
//this.transitionIn();
|
||||
//this._isFirstRender = false;
|
||||
//}
|
||||
//},
|
||||
showBlock: function() {
|
||||
if (this._isFirstRender) {
|
||||
this.transitionIn();
|
||||
this._isFirstRender = false;
|
||||
}
|
||||
},
|
||||
deleteBlock: function() {
|
||||
this.transitionOut().then(function() {
|
||||
this.model.destroy();
|
||||
|
@@ -133,7 +133,7 @@ define([
|
||||
},
|
||||
});
|
||||
|
||||
App.on('before:start', function() {
|
||||
App.on('before:start', function(App, options) {
|
||||
App.registerBlockType('button', {
|
||||
blockModel: Module.ButtonBlockModel,
|
||||
blockView: Module.ButtonBlockView,
|
||||
|
@@ -387,7 +387,7 @@ define([
|
||||
},
|
||||
});
|
||||
|
||||
App.on('before:start', function() {
|
||||
App.on('before:start', function(App, options) {
|
||||
App.registerBlockType('container', {
|
||||
blockModel: Module.ContainerBlockModel,
|
||||
blockView: Module.ContainerBlockView,
|
||||
|
@@ -140,7 +140,7 @@ define([
|
||||
}
|
||||
},
|
||||
});
|
||||
App.on('before:start', function() {
|
||||
App.on('before:start', function(App, options) {
|
||||
App.registerBlockType('divider', {
|
||||
blockModel: Module.DividerBlockModel,
|
||||
blockView: Module.DividerBlockView,
|
||||
|
@@ -116,7 +116,7 @@ define([
|
||||
},
|
||||
});
|
||||
|
||||
App.on('before:start', function() {
|
||||
App.on('before:start', function(App, options) {
|
||||
App.registerBlockType('footer', {
|
||||
blockModel: Module.FooterBlockModel,
|
||||
blockView: Module.FooterBlockView,
|
||||
|
@@ -116,7 +116,7 @@ define([
|
||||
},
|
||||
});
|
||||
|
||||
App.on('before:start', function() {
|
||||
App.on('before:start', function(App, options) {
|
||||
App.registerBlockType('header', {
|
||||
blockModel: Module.HeaderBlockModel,
|
||||
blockView: Module.HeaderBlockView,
|
||||
|
@@ -365,7 +365,7 @@ define([
|
||||
});
|
||||
Module.ImageWidgetView = ImageWidgetView;
|
||||
|
||||
App.on('before:start', function() {
|
||||
App.on('before:start', function(App, options) {
|
||||
App.registerBlockType('image', {
|
||||
blockModel: Module.ImageBlockModel,
|
||||
blockView: Module.ImageBlockView,
|
||||
|
@@ -520,7 +520,7 @@ define([
|
||||
},
|
||||
});
|
||||
|
||||
App.on('before:start', function() {
|
||||
App.on('before:start', function(App, options) {
|
||||
App.registerBlockType('posts', {
|
||||
blockModel: Module.PostsBlockModel,
|
||||
blockView: Module.PostsBlockView,
|
||||
|
@@ -389,7 +389,7 @@ define([
|
||||
},
|
||||
});
|
||||
|
||||
App.on('before:start', function() {
|
||||
App.on('before:start', function(App, options) {
|
||||
App.registerBlockType('social', {
|
||||
blockModel: Module.SocialBlockModel,
|
||||
blockView: Module.SocialBlockView,
|
||||
|
@@ -87,7 +87,7 @@ define([
|
||||
},
|
||||
});
|
||||
|
||||
App.on('before:start', function() {
|
||||
App.on('before:start', function(App, options) {
|
||||
App.registerBlockType('spacer', {
|
||||
blockModel: Module.SpacerBlockModel,
|
||||
blockView: Module.SpacerBlockView,
|
||||
|
@@ -100,7 +100,7 @@ define([
|
||||
},
|
||||
});
|
||||
|
||||
App.on('before:start', function() {
|
||||
App.on('before:start', function(App, options) {
|
||||
App.registerBlockType('text', {
|
||||
blockModel: Module.TextBlockModel,
|
||||
blockView: Module.TextBlockView,
|
||||
|
@@ -67,7 +67,7 @@ define([
|
||||
return _.filter(blocks, predicate);
|
||||
};
|
||||
|
||||
App.on('before:start', function(options) {
|
||||
App.on('before:start', function(App, options) {
|
||||
// Expose block methods globally
|
||||
App.registerBlockType = Module.registerBlockType;
|
||||
App.getBlockTypeModel = Module.getBlockTypeModel;
|
||||
|
Reference in New Issue
Block a user