Skip to content
This repository has been archived by the owner on Jan 2, 2021. It is now read-only.

Commit

Permalink
Fixes #22:
Browse files Browse the repository at this point in the history
	Conflict on $.support when bootstrap3 is in place

Update grunt toolchain
Bump version
rebuild
  • Loading branch information
basti1253 committed Mar 6, 2014
1 parent 5e3e456 commit 973285f
Show file tree
Hide file tree
Showing 27 changed files with 215 additions and 149 deletions.
6 changes: 3 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var uiFiles = [
],
pluginFiles = [
// generated by requirejs, banners and comments stripped by concat/uglifyjs
"dist/coverflow.standalone.js",
"dist/coverflow.standalone.js"
],
jsFiles = uiFiles.concat( pluginFiles ),
cssFiles = [
Expand Down Expand Up @@ -77,7 +77,7 @@ grunt.loadNpmTasks( "grunt-contrib-requirejs" );
grunt.initConfig({
pkg: grunt.file.readJSON("package.json"),
files: {
dist: "<%= pkg.name %>-<%= pkg.version %>",
dist: "<%= pkg.name %>-<%= pkg.version %>"
},
compare_size: {
all: [
Expand Down Expand Up @@ -213,7 +213,7 @@ grunt.initConfig({
"jquery",
"uiCore",
"uiWidget",
"uiEffects",
"uiEffects"
],

//File paths are relative to the build file, or if running a commmand
Expand Down
5 changes: 5 additions & 0 deletions build/wrap.start
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
(function( $, window, document, undefined ) {

$.coverflow = {
renderer : {},
support : {}
};
4 changes: 2 additions & 2 deletions dist/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

![](https://raw.github.com/coverflowjs/coverflow/master/demo/img/screenshot.png)

The jQueryUI Coverflow project seeks to create a fully functional 'CoverFlow' effect using a combination of jQuery, jQuery UI components and CSS3 transforms.
The Coverflow project seeks to create a fully functional 'CoverFlow' effect using a combination of jQuery, jQuery UI components and CSS3 transforms.

## Getting Started

Expand All @@ -16,7 +16,7 @@ The jQueryUI Coverflow project seeks to create a fully functional 'CoverFlow' ef
- [API methods](http://coverflowjs.github.io/coverflow/api/methods/)

## License
Copyright (c) 2008-2013 Paul Baukus, Addy Osmani, Sebastian Sauer, Brandon Belvin
Copyright (c) 2008-2014 Paul Baukus, Addy Osmani, Sebastian Sauer, Brandon Belvin
Licensed under the MIT licenses.

## Contributing
Expand Down
4 changes: 2 additions & 2 deletions dist/coverflow.css

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

70 changes: 41 additions & 29 deletions dist/coverflow.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! CoverflowJS - v3.0.0 - 2014-01-25
/*! CoverflowJS - v3.0.1 - 2014-03-06
* Copyright (c) 2014 Paul Baukus, Addy Osmani, Sebastian Sauer, Brandon Belvin, April Barrett; Licensed MIT */
/*! jQuery UI - v1.10.4 - 2014-01-17
* http://jqueryui.com
Expand Down Expand Up @@ -2109,6 +2109,11 @@ $.each( baseEasings, function( name, easeIn ) {

(function( $, window, document, undefined ) {

$.coverflow = {
renderer : {},
support : {}
};

function ClassicRenderer( widget, element, items, options ) {

var me = this;
Expand Down Expand Up @@ -2234,7 +2239,7 @@ ClassicRenderer.prototype = {

var me = this;

if( $.support.transform ) {
if( $.coverflow.support.transform ) {
me._matrixTransform.apply( me, arguments );
return;
}
Expand All @@ -2258,16 +2263,11 @@ ClassicRenderer.prototype = {
}
};

if( $.coverflow == null ) {
$.coverflow = {
renderer : {}
};
}

$.extend( $.coverflow.renderer, {
Classic : ClassicRenderer
});


function toRadian ( angle ) {
return parseFloat( ( angle * 0.017453 ) .toFixed( 6 ) );
}
Expand Down Expand Up @@ -2419,12 +2419,6 @@ ThreeDRenderer.prototype = {
}
};

if( $.coverflow == null ) {
$.coverflow = {
renderer : {}
};
}

$.extend( $.coverflow.renderer, {
ThreeD : ThreeDRenderer
});
Expand Down Expand Up @@ -2465,6 +2459,7 @@ $.extend( $.coverflow.renderer, {
vendorsLength = vendors.length,
vendorPrefix = "",
x = 0,
support = $.coverflow.support,
capitalize = function( string ) {
return string.charAt( 0 ).toUpperCase() + string.slice( 1 );
};
Expand Down Expand Up @@ -2504,24 +2499,32 @@ $.extend( $.coverflow.renderer, {
if( p !== "ms" ) {
p = capitalize( p );
}
if( ! $.support.transform && p + "Transform" in style ) {
$.support.transform = p + "Transform";
if( ! support.transform && p + "Transform" in style ) {
support.transform = p + "Transform";
}
if( ! $.support.transition && p + "Transition" in style ) {
$.support.transition = p + "Transition";
if( ! support.transition && p + "Transition" in style ) {
support.transition = p + "Transition";
}

if( $.support.transform && $.support.transition ) {
if( support.transform && support.transition ) {
vendorPrefix = p;
return false;
}
return true;
});

if( ! $.support.transform || ! $.support.transition ) {
if( ! support.transform || ! support.transition ) {

$.support.transform = "transform" in style ? "transform" : false;
$.support.transition = "transition" in style ? "transition" : false;
support.transform = "transform" in style ? "transform" : false;
support.transition = "transition" in style ? "transition" : false;
}

// expose feature support if not already set
if( $.support.transform == null ) {
$.support.transform = support.transform;
}
if( $.support.transition == null ) {
$.support.transition = support.transition;
}

if( $.cssProps == null ) {
Expand Down Expand Up @@ -2676,7 +2679,7 @@ $.extend( $.coverflow.renderer, {
}
}

$.support.transform3d = (function() {
$.coverflow.support.transform3d = (function() {

var ret = !! testPropsAll( "perspective" );

Expand All @@ -2692,6 +2695,11 @@ $.extend( $.coverflow.renderer, {
return ret;
})();

// expose feature support if not already set
if( $.support.transform3d == null ) {
$.support.transform3d = $.coverflow.support.transform3d;
}


/**
* @license Released under the MIT license.
Expand Down Expand Up @@ -2841,7 +2849,8 @@ $.extend( $.coverflow.renderer, {
var me = this,
o = this.options,
Renderer,
rendererOptions;
rendererOptions,
support = $.coverflow.support || {};

me.elementOrigStyle = me.element.attr( "style" );

Expand All @@ -2861,14 +2870,16 @@ $.extend( $.coverflow.renderer, {

me._setDimensions();

me.support = support;

if ( // transform is not supported
! $.support.transform
! support.transform
// or is old IE
|| isOldie
// or it's opera: fails to create a perspective on coverflow items
|| window.opera != null
// or no css3 transformation is available
|| ! $.support.transform3d
|| ! support.transform3d
) {
Renderer = $.coverflow.renderer.Classic;
} else {
Expand Down Expand Up @@ -2915,7 +2926,7 @@ $.extend( $.coverflow.renderer, {
me._bindSwipe();
}

me.useJqueryAnimate = ! ( $.support.transition && $.isFunction( window.requestAnimationFrame ) );
me.useJqueryAnimate = ! ( support.transition && $.isFunction( window.requestAnimationFrame ) );

me.coverflowrafid = 0;
},
Expand Down Expand Up @@ -3139,7 +3150,7 @@ $.extend( $.coverflow.renderer, {
}

me.element
.unbind( eventsMap[ $.support.transition ] );
.unbind( eventsMap[ me.support.transition ] );
}
}
me.isTicking = true;
Expand Down Expand Up @@ -3219,7 +3230,7 @@ $.extend( $.coverflow.renderer, {
}

me.element
.one( eventsMap[ $.support.transition ],
.one( eventsMap[ me.support.transition ],
function() {
me._refresh( 1, from, to );
me._onAnimationEnd();
Expand Down Expand Up @@ -3309,4 +3320,5 @@ $.extend( $.coverflow.renderer, {
}
});


})( jQuery, this, this.document );
6 changes: 3 additions & 3 deletions dist/coverflow.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 973285f

Please sign in to comment.