Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/ratchet.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@gmail.com>2015-02-06 19:32:33 +0300
committerXhmikosR <xhmikosr@gmail.com>2015-02-06 19:32:33 +0300
commitec4b3815616f5d17195f5e7e0b65da062b1f9db1 (patch)
treef1d4ad2dea906527e8fe4493639e7b6e30018d1b
parent61759b8d96b89c00159a38ceffb9e3140dfc6b64 (diff)
parent3c117e77a4d04a2f786a8179e84440b768a9e8d3 (diff)
Merge pull request #745 from Johann-S/js-refactor
Js refactor
-rw-r--r--Gruntfile.js1
-rwxr-xr-xjs/common.js30
-rw-r--r--js/push.js3
-rw-r--r--js/sliders.js18
-rw-r--r--js/toggles.js16
5 files changed, 37 insertions, 31 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 2d3a39b..74c2086 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -50,6 +50,7 @@ module.exports = function (grunt) {
banner: '<%= banner %>'
},
src: [
+ 'js/common.js',
'js/modals.js',
'js/popovers.js',
'js/push.js',
diff --git a/js/common.js b/js/common.js
new file mode 100755
index 0000000..770f456
--- /dev/null
+++ b/js/common.js
@@ -0,0 +1,30 @@
+/* ========================================================================
+ * Ratchet: common.js v2.0.2
+ * http://goratchet.com/
+ * ========================================================================
+ * Copyright 2015 Connor Sears
+ * Licensed under MIT (https://github.com/twbs/ratchet/blob/master/LICENSE)
+ * ======================================================================== */
+
+!(function () {
+ 'use strict';
+
+ // Create Ratchet namespace
+ if (typeof window.RATCHET === 'undefined') {
+ window.RATCHET = {};
+ }
+
+ // Original script from http://davidwalsh.name/vendor-prefix
+ window.RATCHET.getBrowserCapabilities = (function () {
+ var styles = window.getComputedStyle(document.documentElement, '');
+ var pre = (Array.prototype.slice
+ .call(styles)
+ .join('')
+ .match(/-(moz|webkit|ms)-/) || (styles.OLink === '' && ['', 'o'])
+ )[1];
+ return {
+ prefix: '-' + pre + '-',
+ transform: pre[0].toUpperCase() + pre.substr(1) + 'Transform'
+ };
+ })();
+}());
diff --git a/js/push.js b/js/push.js
index 8d091a1..30ba23b 100644
--- a/js/push.js
+++ b/js/push.js
@@ -502,6 +502,9 @@
}
});
window.addEventListener('popstate', popstate);
+
+ // TODO : Remove this line in the next major version
window.PUSH = PUSH;
+ window.RATCHET.push = PUSH;
}());
diff --git a/js/sliders.js b/js/sliders.js
index be9cc98..553d232 100644
--- a/js/sliders.js
+++ b/js/sliders.js
@@ -25,22 +25,8 @@
var scrollableArea;
var startedMoving;
- // Original script from http://davidwalsh.name/vendor-prefix
- var getBrowserCapabilities = (function () {
- var styles = window.getComputedStyle(document.documentElement, '');
- var pre = (Array.prototype.slice
- .call(styles)
- .join('')
- .match(/-(moz|webkit|ms)-/) || (styles.OLink === '' && ['', 'o'])
- )[1];
- return {
- prefix: '-' + pre + '-',
- transform: pre[0].toUpperCase() + pre.substr(1) + 'Transform'
- };
- })();
-
- var transformPrefix = getBrowserCapabilities.prefix;
- var transformProperty = getBrowserCapabilities.transform;
+ var transformPrefix = window.RATCHET.getBrowserCapabilities.prefix;
+ var transformProperty = window.RATCHET.getBrowserCapabilities.transform;
var getSlider = function (target) {
var i;
diff --git a/js/toggles.js b/js/toggles.js
index 56d2523..f596a16 100644
--- a/js/toggles.js
+++ b/js/toggles.js
@@ -14,21 +14,7 @@
var touchMove = false;
var distanceX = false;
var toggle = false;
-
- // Original script from http://davidwalsh.name/vendor-prefix
- var getBrowserCapabilities = (function () {
- var styles = window.getComputedStyle(document.documentElement, '');
- var pre = (Array.prototype.slice
- .call(styles)
- .join('')
- .match(/-(moz|webkit|ms)-/) || (styles.OLink === '' && ['', 'o'])
- )[1];
- return {
- transform: pre[0].toUpperCase() + pre.substr(1) + 'Transform'
- };
- })();
-
- var transformProperty = getBrowserCapabilities.transform;
+ var transformProperty = window.RATCHET.getBrowserCapabilities.transform;
var findToggle = function (target) {
var i;