diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-02-10 13:35:51 +0100 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-02-10 13:35:58 +0100 |
commit | b4b710fb4379bf9ac1a19d8e9b9708c60380fdb4 (patch) | |
tree | 7385109f579a01c264be93ab3f6a99ff3b57e7c3 /js/vendor/outlayer | |
parent | 7048d4e20198c5134d539c26dd9ed98a7580ef43 (diff) |
try to update to angular 1.5
Diffstat (limited to 'js/vendor/outlayer')
-rw-r--r-- | js/vendor/outlayer/.bower.json | 8 | ||||
-rw-r--r-- | js/vendor/outlayer/bower.json | 1 | ||||
-rw-r--r-- | js/vendor/outlayer/item.js | 29 | ||||
-rw-r--r-- | js/vendor/outlayer/outlayer.js | 2 |
4 files changed, 16 insertions, 24 deletions
diff --git a/js/vendor/outlayer/.bower.json b/js/vendor/outlayer/.bower.json index 5ff22b9cb..d4729ec9f 100644 --- a/js/vendor/outlayer/.bower.json +++ b/js/vendor/outlayer/.bower.json @@ -1,6 +1,5 @@ { "name": "outlayer", - "version": "2.0.0", "description": "the brains and guts of a layout library", "main": "outlayer.js", "dependencies": { @@ -41,11 +40,12 @@ "isotope" ], "license": "MIT", - "_release": "2.0.0", + "version": "2.0.1", + "_release": "2.0.1", "_resolution": { "type": "version", - "tag": "v2.0.0", - "commit": "6e73996159bb947b39829d8963d327808897a51d" + "tag": "v2.0.1", + "commit": "d18225dc48f760c6f009095c596ce68bb6c267d7" }, "_source": "git://github.com/metafizzy/outlayer.git", "_target": "~2.0.0", diff --git a/js/vendor/outlayer/bower.json b/js/vendor/outlayer/bower.json index 173c84d40..e910861d7 100644 --- a/js/vendor/outlayer/bower.json +++ b/js/vendor/outlayer/bower.json @@ -1,6 +1,5 @@ { "name": "outlayer", - "version": "2.0.0", "description": "the brains and guts of a layout library", "main": "outlayer.js", "dependencies": { diff --git a/js/vendor/outlayer/item.js b/js/vendor/outlayer/item.js index e5f11f736..1aa792cf9 100644 --- a/js/vendor/outlayer/item.js +++ b/js/vendor/outlayer/item.js @@ -11,14 +11,11 @@ 'ev-emitter/ev-emitter', 'get-size/get-size' ], - function( EvEmitter, getSize ) { - return factory( window, EvEmitter, getSize ); - } + factory ); } else if ( typeof module == 'object' && module.exports ) { // CommonJS - Browserify, Webpack module.exports = factory( - window, require('ev-emitter'), require('get-size') ); @@ -26,13 +23,12 @@ // browser global window.Outlayer = {}; window.Outlayer.Item = factory( - window, window.EvEmitter, window.getSize ); } -}( window, function factory( window, EvEmitter, getSize ) { +}( window, function factory( EvEmitter, getSize ) { 'use strict'; // ----- helpers ----- // @@ -60,13 +56,13 @@ var transitionEndEvent = { transition: 'transitionend' }[ transitionProperty ]; -// cache all vendor properties -var vendorProperties = [ - transformProperty, - transitionProperty, - transitionProperty + 'Duration', - transitionProperty + 'Property' -]; +// cache all vendor properties that could have vendor prefix +var vendorProperties = { + transform: transformProperty, + transition: transitionProperty, + transitionDuration: transitionProperty + 'Duration', + transitionProperty: transitionProperty + 'Property' +}; // -------------------------- Item -------------------------- // @@ -280,7 +276,7 @@ proto._nonTransition = function( args ) { * @param {Boolean} isCleaning - removes transition styles after transition * @param {Function} onTransitionEnd - callback */ -proto._transition = function( args ) { +proto.transition = function( args ) { // redirect to nonTransition if no transition duration if ( !parseFloat( this.layout.options.transitionDuration ) ) { this._nonTransition( args ); @@ -326,8 +322,7 @@ function toDashedAll( str ) { }); } -var transitionProps = 'opacity,' + - toDashedAll( vendorProperties.transform || 'transform' ); +var transitionProps = 'opacity,' + toDashedAll( transformProperty ); proto.enableTransition = function(/* style */) { // HACK changing transitionProperty during a transition @@ -354,8 +349,6 @@ proto.enableTransition = function(/* style */) { this.element.addEventListener( transitionEndEvent, this, false ); }; -proto.transition = Item.prototype[ transitionProperty ? '_transition' : '_nonTransition' ]; - // ----- events ----- // proto.onwebkitTransitionEnd = function( event ) { diff --git a/js/vendor/outlayer/outlayer.js b/js/vendor/outlayer/outlayer.js index af97687c5..84efce9da 100644 --- a/js/vendor/outlayer/outlayer.js +++ b/js/vendor/outlayer/outlayer.js @@ -1,5 +1,5 @@ /*! - * Outlayer v2.0.0 + * Outlayer v2.0.1 * the brains and guts of a layout library * MIT license */ |