Skip to content
This repository was archived by the owner on May 10, 2018. It is now read-only.

Commit 292a20f

Browse files
author
Julien Bouquillon
committed
Merge pull request #300 from raphaelluchini/master
Fixing issue: #254
2 parents 272ccc7 + 79235be commit 292a20f

File tree

4 files changed

+7
-43
lines changed

4 files changed

+7
-43
lines changed

dist/angular-carousel.css

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-carousel.js

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Angular Carousel - Mobile friendly touch carousel for AngularJS
3-
* @version v0.3.9 - 2015-01-26
3+
* @version v0.3.9 - 2015-02-11
44
* @link http://revolunet.github.com/angular-carousel
55
* @author Julien Bouquillon <[email protected]>
66
* @license MIT License, http://www.opensource.org/licenses/MIT
@@ -1119,26 +1119,7 @@ angular.module('angular-carousel.shifty', [])
11191119
,'composeEasingObject': composeEasingObject
11201120
});
11211121

1122-
// `root` is provided in the intro/outro files.
1123-
1124-
// A hook used for unit testing.
1125-
if (typeof SHIFTY_DEBUG_NOW === 'function') {
1126-
root.timeoutHandler = timeoutHandler;
1127-
}
1128-
1129-
// Bootstrap Tweenable appropriately for the environment.
1130-
if (typeof exports === 'object') {
1131-
// CommonJS
1132-
module.exports = Tweenable;
1133-
} else if (typeof define === 'function' && define.amd) {
1134-
// AMD: define it as a named module to avoid the mismatched error(http://requirejs.org/docs/errors.html#mismatch)
1135-
define('shifty', [], function () {return Tweenable;});
1136-
root.Tweenable = Tweenable;
1137-
} else if (typeof root.Tweenable === 'undefined') {
1138-
// Browser: Make `Tweenable` globally accessible.
1139-
root.Tweenable = Tweenable;
1140-
}
1141-
1122+
root.Tweenable = Tweenable;
11421123
return Tweenable;
11431124

11441125
} ());

dist/angular-carousel.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/directives/shifty.js

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -470,26 +470,7 @@ angular.module('angular-carousel.shifty', [])
470470
,'composeEasingObject': composeEasingObject
471471
});
472472

473-
// `root` is provided in the intro/outro files.
474-
475-
// A hook used for unit testing.
476-
if (typeof SHIFTY_DEBUG_NOW === 'function') {
477-
root.timeoutHandler = timeoutHandler;
478-
}
479-
480-
// Bootstrap Tweenable appropriately for the environment.
481-
if (typeof exports === 'object') {
482-
// CommonJS
483-
module.exports = Tweenable;
484-
} else if (typeof define === 'function' && define.amd) {
485-
// AMD: define it as a named module to avoid the mismatched error(http://requirejs.org/docs/errors.html#mismatch)
486-
define('shifty', [], function () {return Tweenable;});
487-
root.Tweenable = Tweenable;
488-
} else if (typeof root.Tweenable === 'undefined') {
489-
// Browser: Make `Tweenable` globally accessible.
490-
root.Tweenable = Tweenable;
491-
}
492-
473+
root.Tweenable = Tweenable;
493474
return Tweenable;
494475

495476
} ());

0 commit comments

Comments
 (0)