Skip to content

Commit

Permalink
Minor changes to the loading of canvas.js.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Enclavelyio @andrew-worsfold
Enclavelyio authored and andrew-worsfold committed Jul 29, 2017
1 parent 2d530af commit 4274eae
Show file tree
Hide file tree
Showing 40 changed files with 1,635 additions and 1,476 deletions.
4 changes: 2 additions & 2 deletions assets/css/admin.css.map
View file

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

4 changes: 2 additions & 2 deletions assets/css/admin.min.css.map
View file

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

4 changes: 2 additions & 2 deletions assets/css/canvas.css.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/css/canvas.min.css.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/css/frontend.css.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/css/frontend.min.css.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/css/ie.css.map
View file

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

4 changes: 2 additions & 2 deletions assets/css/ie.min.css.map
View file

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

4 changes: 2 additions & 2 deletions assets/css/sidebar.css.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/css/sidebar.min.css.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/css/tinymce.css.map
View file

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

4 changes: 2 additions & 2 deletions assets/css/tinymce.min.css.map
View file

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

25 changes: 14 additions & 11 deletions assets/js/dist/canvas.js
View file
Expand Up @@ -167,7 +167,7 @@
};
} );

app.channel.on('sidebar:initialize', function() {
app.channel.on( 'sidebar:initialize', function() {

// Load modules
app.module( 'module:elements', require( './canvas/modules/elements/elements' ) );
Expand All @@ -176,14 +176,17 @@
app.module( 'module:tools', require( './canvas/modules/tools/tools' ) );
app.module( 'module:css', require( './canvas/modules/css/css' ) );

/**
* Fires when the canvas is initialized.
*
* @since 1.5.0
*
* @param app
*/
app.channel.trigger( 'canvas:initialize', app );
app.channel.on( 'module:canvas:ready', function() {

/**
* Fires when the canvas is initialized.
*
* @since 1.5.0
*
* @param app
*/
app.channel.trigger( 'canvas:initialize', app );
} );
} );

function start() {
Expand Down Expand Up @@ -5928,7 +5931,7 @@ ElementModule = Marionette.Module.extend( {
var module = this;

this.collection = new ElementCollection( options.elements );

var api = {

/**
Expand Down Expand Up @@ -5959,7 +5962,7 @@ ElementModule = Marionette.Module.extend( {
*/
resetElements : function( models, templates, css ) {
if ( models === module.collection.models ) {
//return;
return;
}

$templates.append( templates );
Expand Down
12 changes: 5 additions & 7 deletions assets/js/dist/canvas.min.js
View file

Large diffs are not rendered by default.

52 changes: 21 additions & 31 deletions assets/js/dist/sidebar.js
View file
Expand Up @@ -1881,6 +1881,7 @@ AbstractControl = Marionette.ItemView.extend( {
*/
onMediaButtonChange : function( e ) {
this.media = e.currentTarget.getAttribute( 'data-media' );
app.channel.trigger('sidebar:device', this.media);
this.updateControlGroups();
},

Expand Down Expand Up @@ -5486,7 +5487,6 @@ var SnapshotCollection = Backbone.Collection.extend( {
*/
initialize: function() {
this.addEventListeners();

},

/**
Expand All @@ -5497,7 +5497,6 @@ var SnapshotCollection = Backbone.Collection.extend( {
addEventListeners : function() {
this.listenTo( this, 'add', this.checkLength );
this.listenToOnce( app.channel, 'canvas:initialize', function() {
this.elements = app.channel.request( 'canvas:elements' );
this.save( window._l10n.initialized );
} );
},
Expand All @@ -5519,13 +5518,14 @@ var SnapshotCollection = Backbone.Collection.extend( {
}
}

var models = app.channel.request( 'canvas:elements' );
var templates = app.channel.request( 'canvas:templates' );
var css = app.channel.request( 'canvas:css' );

// Add the new entry to the collection
var entry = this.add( {
label : label || '',
elements : this.elements ? this.elements.toJSON() : [],
elements : models ? models.toJSON() : [],
templates: templates,
css: css,
time : this.getTime(),
Expand Down Expand Up @@ -6500,7 +6500,9 @@ DevicePreviewModule = Marionette.Module.extend( {
this.viewport = this.preview.querySelector( '.tailor-preview__viewport' );
this.mediaQueries = window._media_queries;

this.setActive( this.$buttons.get(0) );
//this.setActive( this.$buttons.get(0) );
this.setDevice( this.$buttons.get(0).getAttribute( 'data-device' ) );

this.addEventListeners();

/**
Expand All @@ -6519,34 +6521,29 @@ DevicePreviewModule = Marionette.Module.extend( {
* @since 1.7.4
*/
addEventListeners : function() {
this.$buttons.on( 'click', this.onDevicePreview.bind( this ) );
this.$buttons.on( 'click', this.onClick.bind( this ) );
app.channel.on( 'sidebar:device', this.setDevice.bind(this) );
},

onDevicePreview : function( e ) {
var button = e.target;
var previous = this.$buttons.filter( "[data-device='" + this.device + "']" ).get(0);
onClick: function( e ) {
this.setDevice( e.target.getAttribute( 'data-device' ) );
},

this.setInactive( previous );
this.setActive( button );
setDevice: function( device ) {
this.device = device;

this.device = button.getAttribute( 'data-device' );
this.preview.className = 'tailor-preview ' + this.device + '-screens';
// Update buttons
var $button = this.$buttons.filter( "[data-device='" + this.device + "']" );
this.$buttons.removeClass( 'is-active' ).attr( 'aria-pressed', false );
$button.addClass( 'is-active' ).attr( 'aria-pressed', true );

// Update preview window
if ( this.mediaQueries.hasOwnProperty( this.device ) && this.mediaQueries[ this.device ].max ) {
this.viewport.style.maxWidth = this.mediaQueries[ this.device ].max;
}
else {
this.viewport.style.maxWidth ='';
}
},

setActive: function( button ) {
button.classList.add( 'is-active' );
button.setAttribute( 'aria-pressed', 'true' );
},

setInactive: function( button ) {
button.classList.remove( 'is-active' );
button.setAttribute( 'aria-pressed', 'false' );
}
} );

Expand Down Expand Up @@ -6793,7 +6790,7 @@ HistoryModule = Marionette.Module.extend( {
/**
* Initializes the module.
*/
onBeforeStart : function() {
onStart : function( options ) {
var module = this;

module.collection = new SnapshotsCollection();
Expand All @@ -6817,17 +6814,10 @@ HistoryModule = Marionette.Module.extend( {
};

app.channel.reply( 'sidebar:history', api.getSnapshot );
},

/**
* Initializes the module.
*
* @param options
*/
onStart : function( options ) {
this.l10n = options.l10n;
this.addEventListeners();

/**
* Fires when the module is initialized.
*
Expand Down
8 changes: 4 additions & 4 deletions assets/js/dist/sidebar.min.js
View file

Large diffs are not rendered by default.

21 changes: 12 additions & 9 deletions assets/js/src/canvas.js
View file
Expand Up @@ -166,7 +166,7 @@
};
} );

app.channel.on('sidebar:initialize', function() {
app.channel.on( 'sidebar:initialize', function() {

// Load modules
app.module( 'module:elements', require( './canvas/modules/elements/elements' ) );
Expand All @@ -175,14 +175,17 @@
app.module( 'module:tools', require( './canvas/modules/tools/tools' ) );
app.module( 'module:css', require( './canvas/modules/css/css' ) );

/**
* Fires when the canvas is initialized.
*
* @since 1.5.0
*
* @param app
*/
app.channel.trigger( 'canvas:initialize', app );
app.channel.on( 'module:canvas:ready', function() {

/**
* Fires when the canvas is initialized.
*
* @since 1.5.0
*
* @param app
*/
app.channel.trigger( 'canvas:initialize', app );
} );
} );

function start() {
Expand Down
4 changes: 2 additions & 2 deletions assets/js/src/canvas/modules/elements/elements.js
View file
Expand Up @@ -17,7 +17,7 @@ ElementModule = Marionette.Module.extend( {
var module = this;

this.collection = new ElementCollection( options.elements );

var api = {

/**
Expand Down Expand Up @@ -48,7 +48,7 @@ ElementModule = Marionette.Module.extend( {
*/
resetElements : function( models, templates, css ) {
if ( models === module.collection.models ) {
//return;
return;
}

$templates.append( templates );
Expand Down
1 change: 1 addition & 0 deletions assets/js/src/sidebar/components/controls/abstract-control.js
View file
Expand Up @@ -166,6 +166,7 @@ AbstractControl = Marionette.ItemView.extend( {
*/
onMediaButtonChange : function( e ) {
this.media = e.currentTarget.getAttribute( 'data-media' );
app.channel.trigger('sidebar:device', this.media);
this.updateControlGroups();
},

Expand Down
5 changes: 2 additions & 3 deletions assets/js/src/sidebar/entities/collections/snapshots.js
View file
Expand Up @@ -30,7 +30,6 @@ var SnapshotCollection = Backbone.Collection.extend( {
*/
initialize: function() {
this.addEventListeners();

},

/**
Expand All @@ -41,7 +40,6 @@ var SnapshotCollection = Backbone.Collection.extend( {
addEventListeners : function() {
this.listenTo( this, 'add', this.checkLength );
this.listenToOnce( app.channel, 'canvas:initialize', function() {
this.elements = app.channel.request( 'canvas:elements' );
this.save( window._l10n.initialized );
} );
},
Expand All @@ -63,13 +61,14 @@ var SnapshotCollection = Backbone.Collection.extend( {
}
}

var models = app.channel.request( 'canvas:elements' );
var templates = app.channel.request( 'canvas:templates' );
var css = app.channel.request( 'canvas:css' );

// Add the new entry to the collection
var entry = this.add( {
label : label || '',
elements : this.elements ? this.elements.toJSON() : [],
elements : models ? models.toJSON() : [],
templates: templates,
css: css,
time : this.getTime(),
Expand Down
35 changes: 16 additions & 19 deletions assets/js/src/sidebar/modules/device-preview/device-preview.js
View file
Expand Up @@ -36,7 +36,9 @@ DevicePreviewModule = Marionette.Module.extend( {
this.viewport = this.preview.querySelector( '.tailor-preview__viewport' );
this.mediaQueries = window._media_queries;

this.setActive( this.$buttons.get(0) );
//this.setActive( this.$buttons.get(0) );
this.setDevice( this.$buttons.get(0).getAttribute( 'data-device' ) );

this.addEventListeners();

/**
Expand All @@ -55,34 +57,29 @@ DevicePreviewModule = Marionette.Module.extend( {
* @since 1.7.4
*/
addEventListeners : function() {
this.$buttons.on( 'click', this.onDevicePreview.bind( this ) );
this.$buttons.on( 'click', this.onClick.bind( this ) );
app.channel.on( 'sidebar:device', this.setDevice.bind(this) );
},

onClick: function( e ) {
this.setDevice( e.target.getAttribute( 'data-device' ) );
},

onDevicePreview : function( e ) {
var button = e.target;
var previous = this.$buttons.filter( "[data-device='" + this.device + "']" ).get(0);
setDevice: function( device ) {
this.device = device;

this.setInactive( previous );
this.setActive( button );
// Update buttons
var $button = this.$buttons.filter( "[data-device='" + this.device + "']" );
this.$buttons.removeClass( 'is-active' ).attr( 'aria-pressed', false );
$button.addClass( 'is-active' ).attr( 'aria-pressed', true );

this.device = button.getAttribute( 'data-device' );
this.preview.className = 'tailor-preview ' + this.device + '-screens';
// Update preview window
if ( this.mediaQueries.hasOwnProperty( this.device ) && this.mediaQueries[ this.device ].max ) {
this.viewport.style.maxWidth = this.mediaQueries[ this.device ].max;
}
else {
this.viewport.style.maxWidth ='';
}
},

setActive: function( button ) {
button.classList.add( 'is-active' );
button.setAttribute( 'aria-pressed', 'true' );
},

setInactive: function( button ) {
button.classList.remove( 'is-active' );
button.setAttribute( 'aria-pressed', 'false' );
}
} );

Expand Down

0 comments on commit 4274eae

Please sign in to comment.