Revert "@0.0.1"

This reverts commit 6a76068.

Author: orchuban

dist/index.js

@@ -71,10 +71,7 @@ var Navigator = function (_React$Component) {
             startPage: startPage,
             mobileMode: mobileMode,
             swipeRight_x: 0,
-<<<<<<< HEAD
             swipeRightStart_x: 0,
-=======
->>>>>>> parent of 6a76068... @0.0.1
             props: []
         };
 
@@ -334,10 +331,6 @@ var Navigator = function (_React$Component) {
         value: function render() {
             var _this4 = this;
 
-<<<<<<< HEAD
-=======
-            // debugger
->>>>>>> parent of 6a76068... @0.0.1
             var fthis = this;
             // window.navigation_controller = this;
             var nowPage = this.state.historyPages[this.state.historyPages.length - 1];
@@ -360,7 +353,6 @@ var Navigator = function (_React$Component) {
                 return _react2.default.createElement(
                     'div',
                     {
-<<<<<<< HEAD
                         // onTouchStart={(e) => {
 
 
@@ -373,14 +365,6 @@ var Navigator = function (_React$Component) {
                                     fthis.touchBackPage = nowPage;
                                     fthis.swipeRight = true;
                                     fthis.setState({ swipeRightStart_x: e.touches[0].clientX });
-=======
-                        onTouchStart: function onTouchStart(e) {
-                            if (child.props.backOnSwipeRight) {
-                                if (e.touches[0].clientX < 0.20 * innerWidth) {
-                                    fthis.touchBackPage = nowPage;
-                                    fthis.swipeRight = true;
-                                    fthis.setState({ swipeRight_x: e.touches[0].clientX });
->>>>>>> parent of 6a76068... @0.0.1
 
                                     var goToPage = _this4.state.historyPages[_this4.state.historyPages.length - 2];
 
@@ -390,15 +374,8 @@ var Navigator = function (_React$Component) {
                                     (0, _jquery2.default)('#' + goToPage).addClass('showPage overflow_Y_hidden');
                                 }
                             }
-<<<<<<< HEAD
                             if (fthis.swipeRight) {
                                 fthis.setState({ swipeRight_x: e.touches[0].clientX - fthis.state.swipeRightStart_x <= 0 ? 1 : e.touches[0].clientX - fthis.state.swipeRightStart_x });
-=======
-                        },
-                        onTouchMove: function onTouchMove(e) {
-                            if (fthis.swipeRight) {
-                                fthis.setState({ swipeRight_x: e.touches[0].clientX });
->>>>>>> parent of 6a76068... @0.0.1
                             }
                         },
                         onTouchEnd: function onTouchEnd(e) {

package.json

@@ -1,10 +1,6 @@
 {
   "name": "react.cordova-navigation_controller",
-<<<<<<< HEAD
   "version": "1.6.4",
-=======
-  "version": "1.6.3",
->>>>>>> parent of 6a76068... @0.0.1
   "description": "Navigator for Cordova with React.js(react.cordova), This will help you to manage your pages history in the app and change pages with animation.",
   "main": "dist/index.js",
   "scripts": {

src/index.js

@@ -58,10 +58,7 @@ export default class Navigator extends React.Component {
             startPage: startPage,
             mobileMode: mobileMode,
             swipeRight_x: 0,
-<<<<<<< HEAD
             swipeRightStart_x: 0,
-=======
->>>>>>> parent of 6a76068... @0.0.1
             props: []
         }
 
@@ -342,11 +339,7 @@ export default class Navigator extends React.Component {
     }
 
     render() {
-<<<<<<< HEAD
 
-=======
-        // debugger
->>>>>>> parent of 6a76068... @0.0.1
         const fthis = this;
         // window.navigation_controller = this;
         const nowPage = this.state.historyPages[this.state.historyPages.length - 1];
@@ -369,7 +362,6 @@ export default class Navigator extends React.Component {
         return Array.isArray(this.props.children)
             ? this.props.children.map(child => {
                 return <div
-<<<<<<< HEAD
                     // onTouchStart={(e) => {
 
 
@@ -382,14 +374,6 @@ export default class Navigator extends React.Component {
                                 fthis.touchBackPage = nowPage;
                                 fthis.swipeRight = true;
                                 fthis.setState({ swipeRightStart_x: e.touches[0].clientX });
-=======
-                    onTouchStart={(e) => {
-                        if (child.props.backOnSwipeRight) {
-                            if (e.touches[0].clientX < (0.20 * innerWidth)) {
-                                fthis.touchBackPage = nowPage;
-                                fthis.swipeRight = true;
-                                fthis.setState({ swipeRight_x: e.touches[0].clientX });
->>>>>>> parent of 6a76068... @0.0.1
 
                                 const goToPage = this.state.historyPages[this.state.historyPages.length - 2];
 
@@ -400,15 +384,8 @@ export default class Navigator extends React.Component {
                             }
 
                         }
-<<<<<<< HEAD
                             if (fthis.swipeRight) {
                             fthis.setState({ swipeRight_x: (e.touches[0].clientX - fthis.state.swipeRightStart_x) <= 0 ? 1 : e.touches[0].clientX - fthis.state.swipeRightStart_x });
-=======
-                    }}
-                    onTouchMove={(e) => {
-                        if (fthis.swipeRight) {
-                            fthis.setState({ swipeRight_x: e.touches[0].clientX });
->>>>>>> parent of 6a76068... @0.0.1
                         }
                     }}
                     onTouchEnd={(e) => {