Merge pull request #266 from be-fe/2.X

2.0.1 upgrade

README.md

@@ -201,7 +201,7 @@ To learn more advanced features, please refer to [WIKI](https://github.com/BE-FE
         </td>
     </tr>
     <tr>
-        <td>type (Soon abandoned or renamed)</td>
+        <td>type (obsolete)</td>
         <td>-</td>
         <td>-</td>
     </tr>
@@ -256,6 +256,11 @@ To learn more advanced features, please refer to [WIKI](https://github.com/BE-FE
         <td>{number}</td>
         <td>Specifies an index as the default home scene</td>
     </tr>
+    <tr>
+        <td>fixPage</td>
+        <td>{boolean}</td>
+        <td>Whether to disable native scrolling and rebound effect. Default: true (enable)</td>
+    </tr>
     <tr>
         <td>plugins</td>
         <td>{array}</td>

bower.json

@@ -23,5 +23,5 @@
     ".idea",
     "test"
   ],
-  "version": "2.0.0"
+  "version": "2.0.1"
 }

build/iSlider.js

@@ -351,7 +351,7 @@
          * @type {boolean}
          * @public
          */
-        this.fixPage = opts.fixPage || true;
+        this.fixPage = opts.fixPage === undefined ? true : opts.fixPage;
 
         /**
          * slideIndex

build/iSlider.plugin.dot.js

@@ -5,6 +5,21 @@
  * @author BE-FE Team
  *    xieyu33333 [email protected]
  *    shinate [email protected]
+ * @Instructions
+ *    activation:
+ *       new iSlider({
+ *          ...
+ *          plugins: ['dot']
+ *          ...
+ *       });
+ *    more options:
+ *       new iSlider({
+ *          ...
+ *          plugins: [['dot', {locate:'absoulute'}]]
+ *          ...
+ *       });
+ * @options
+ *    locate {string|HTML Element} the warpper of dots value: 'absolute', 'relative' or Specified dom, default: 'absolute'
  */
 
 (function (global, factory) {
@@ -24,9 +39,17 @@
 
     'use strict';
 
-    iSlider && iSlider.regPlugin('dot', function () {
+    iSlider && iSlider.regPlugin('dot', function (opts) {
         var HANDLE = this;
         if (!HANDLE.isVertical) {
+            var locate = (function (locate) {
+                if (locate === 'relative') {
+                    return HANDLE.wrap;
+                } else if (Boolean(locate.nodeName) && Boolean(locate.nodeType)) {
+                    return locate;
+                }
+                return HANDLE.wrap.parentNode;
+            })(opts && opts.locate != null ? opts.locate : false);
             var data = HANDLE.data;
             var dots = [];
             var dotWrap = document.createElement('ul');
@@ -52,7 +75,7 @@
 
             renderDots();
 
-            HANDLE.wrap.parentNode.appendChild(dotWrap);
+            locate.appendChild(dotWrap);
 
             HANDLE.on('slideChange', function () {
                 if (!HANDLE.isVertical) {

change_log.md

@@ -1,3 +1,20 @@
+### iSlider 2.0.1
+
+2015-10-20
+
+#### bug fixes
+
+- fixPage default value
+
+#### Something new
+
+- [Plug-ins] dot support more optisons,
+    - locate - In which the container, values: 'absolute' or 'relative' or DOM, default is 'absolute'
+        - absolute: Same with iSlider
+        - relative: In iSlider
+        - Specified dom, eg: document.getElementById('xxx')
+
+
 ### iSlider 2.0
 
 2015-08-29

demo/public/js/iSlider.js

@@ -351,7 +351,7 @@
          * @type {boolean}
          * @public
          */
-        this.fixPage = opts.fixPage || true;
+        this.fixPage = opts.fixPage === undefined ? true : opts.fixPage;
 
         /**
          * slideIndex

demo/public/js/iSlider.plugin.dot.js

@@ -5,6 +5,21 @@
  * @author BE-FE Team
  *    xieyu33333 [email protected]
  *    shinate [email protected]
+ * @Instructions
+ *    activation:
+ *       new iSlider({
+ *          ...
+ *          plugins: ['dot']
+ *          ...
+ *       });
+ *    more options:
+ *       new iSlider({
+ *          ...
+ *          plugins: [['dot', {locate:'absoulute'}]]
+ *          ...
+ *       });
+ * @options
+ *    locate {string|HTML Element} the warpper of dots value: 'absolute', 'relative' or Specified dom, default: 'absolute'
  */
 
 (function (global, factory) {
@@ -24,9 +39,17 @@
 
     'use strict';
 
-    iSlider && iSlider.regPlugin('dot', function () {
+    iSlider && iSlider.regPlugin('dot', function (opts) {
         var HANDLE = this;
         if (!HANDLE.isVertical) {
+            var locate = (function (locate) {
+                if (locate === 'relative') {
+                    return HANDLE.wrap;
+                } else if (Boolean(locate.nodeName) && Boolean(locate.nodeType)) {
+                    return locate;
+                }
+                return HANDLE.wrap.parentNode;
+            })(opts && opts.locate != null ? opts.locate : false);
             var data = HANDLE.data;
             var dots = [];
             var dotWrap = document.createElement('ul');
@@ -52,7 +75,7 @@
 
             renderDots();
 
-            HANDLE.wrap.parentNode.appendChild(dotWrap);
+            locate.appendChild(dotWrap);
 
             HANDLE.on('slideChange', function () {
                 if (!HANDLE.isVertical) {

package.json

@@ -1,18 +1,16 @@
 {
   "name": "iSlider",
-  "version": "2.0.0",
-  "author": "qbatyqi",
+  "version": "2.0.1",
+  "author": "EUX team",
   "main": "build/iSlider.min.js",
   "description": "Smooth mobile touch slider for Mobile WebApp, HTML5 App, Hybrid App",
   "devDependencies": {
-    "amdclean": "~2.4.0",
     "gulp": "~3.8.9",
     "gulp-clean": "^0.3.1",
     "gulp-connect": "~2.2.0",
     "gulp-cssmin": "^0.1.7",
     "gulp-rename": "x",
-    "gulp-uglify": "~1.0.1",
-    "requirejs": "x"
+    "gulp-uglify": "~1.0.1"
   },
   "repository": {
     "type": "git",

src/index.html

@@ -71,7 +71,7 @@
                 // isLoading: true,
                 // isAutoplay: true,
                 // duration: 5000,
-                plugins: ['dot', 'button', ['zoompic', {zoomFactor: 2}]],
+                plugins: [['dot', {locate:'relative'}], 'button', ['zoompic', {zoomFactor: 2}]],
                 onslide: function () {
                     console.debug(arguments)
                 },

src/js/iSlider.js

@@ -351,7 +351,7 @@
          * @type {boolean}
          * @public
          */
-        this.fixPage = opts.fixPage || true;
+        this.fixPage = opts.fixPage === undefined ? true : opts.fixPage;
 
         /**
          * slideIndex

src/js/plugins/dot.js

@@ -5,6 +5,21 @@
  * @author BE-FE Team
  *    xieyu33333 [email protected]
  *    shinate [email protected]
+ * @Instructions
+ *    activation:
+ *       new iSlider({
+ *          ...
+ *          plugins: ['dot']
+ *          ...
+ *       });
+ *    more options:
+ *       new iSlider({
+ *          ...
+ *          plugins: [['dot', {locate:'absoulute'}]]
+ *          ...
+ *       });
+ * @options
+ *    locate {string|HTML Element} the warpper of dots value: 'absolute', 'relative' or Specified dom, default: 'absolute'
  */
 
 (function (global, factory) {
@@ -24,9 +39,17 @@
 
     'use strict';
 
-    iSlider && iSlider.regPlugin('dot', function () {
+    iSlider && iSlider.regPlugin('dot', function (opts) {
         var HANDLE = this;
         if (!HANDLE.isVertical) {
+            var locate = (function (locate) {
+                if (locate === 'relative') {
+                    return HANDLE.wrap;
+                } else if (Boolean(locate.nodeName) && Boolean(locate.nodeType)) {
+                    return locate;
+                }
+                return HANDLE.wrap.parentNode;
+            })(opts && opts.locate != null ? opts.locate : false);
             var data = HANDLE.data;
             var dots = [];
             var dotWrap = document.createElement('ul');
@@ -52,7 +75,7 @@
 
             renderDots();
 
-            HANDLE.wrap.parentNode.appendChild(dotWrap);
+            locate.appendChild(dotWrap);
 
             HANDLE.on('slideChange', function () {
                 if (!HANDLE.isVertical) {