Merge branch 'master' of https://github.com/orchoban/navigator-cordova-react_js

Author: orchuban

README.md

@@ -98,6 +98,13 @@ options => {  animationIn:integer // have defult
        <td>(goToPageKey,levelAction) => { ... }</td>
     </tr>
     <tr>
+      <tr>
+      <td>changeRoute</td>
+     <td>boolean</td>
+      <td>optional</td>
+       <td>true (on cordova native platforms => false)</td>
+       <td>Determines whether to change the URL to the component key</td>
+    </tr>
       <td>homePageKey</td>
      <td>string</td>
       <td>optional</td>

dist/index.js

@@ -44,7 +44,11 @@ var Navigator = function (_React$Component) {
 
         var homePage = _this.props.homePageKey ? _this.props.homePageKey : Array.isArray(_this.props.children) ? _this.props.children[0].key : _this.props.children.key;
 
-        if (mobileMode) {
+        var changeRoute = true; //default
+        if (mobileMode) changeRoute = false;
+        if (_this.props.changeRoute !== undefined) changeRoute = _this.props.changeRoute;
+
+        if (!changeRoute) {
             startPage = homePage;
         } else {
 
@@ -59,6 +63,7 @@ var Navigator = function (_React$Component) {
         if (startPage !== homePage) historyPages.push(startPage);
 
         _this.state = {
+            changeRoute: changeRoute,
             historyPages: historyPages,
             nowPage: startPage,
             homePageKey: homePage,
@@ -247,7 +252,10 @@ var Navigator = function (_React$Component) {
                         this.setState({ historyPages: new_historyPages });
                     }
 
-                    if (!window.cordova) window.location.href = window.location.href.substr(0, window.location.href.lastIndexOf("/") + 1) + "#" + (goToPage !== this.state.homePageKey ? goToPage : "");else if (window.cordova.platformId === "browser") window.location.href = window.location.href.substr(0, window.location.href.lastIndexOf("/") + 1) + "#" + (goToPage !== this.state.homePageKey ? goToPage : "");
+                    if (this.state.changeRoute) {
+
+                        window.location.href = window.location.href.substr(0, window.location.href.lastIndexOf("/") + 1) + "#" + (goToPage !== this.state.homePageKey ? goToPage : "");
+                    }
 
                     //----navigator and animation----///
 
@@ -291,7 +299,7 @@ var Navigator = function (_React$Component) {
         key: 'componentWillMount',
         value: function componentWillMount() {
             var fthis = this;
-            if (fthis.state.mobileMode) {
+            if (!fthis.state.changeRoute) {
 
                 // //---lock portrait
                 // window.screen.orientation.lock('portrait');
@@ -346,7 +354,6 @@ var Navigator = function (_React$Component) {
                     'div',
                     {
                         onTouchStart: function onTouchStart(e) {
-
                             if (child.props.backOnSwipeRight) {
                                 if (e.touches[0].clientX < 0.20 * innerWidth) {
                                     fthis.touchBackPage = nowPage;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react.cordova-navigation_controller",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "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

@@ -21,8 +21,13 @@ export default class Navigator extends React.Component {
                 ? this.props.children[0].key
                 : this.props.children.key;
 
+        let changeRoute = true;//default
+        if (mobileMode)
+            changeRoute = false;
+        if (this.props.changeRoute !== undefined)
+            changeRoute = this.props.changeRoute;
 
-        if (mobileMode) {
+        if (!changeRoute) {
             startPage = homePage;
         } else {
 
@@ -45,6 +50,7 @@ export default class Navigator extends React.Component {
 
 
         this.state = {
+            changeRoute: changeRoute,
             historyPages: historyPages,
             nowPage: startPage,
             homePageKey: homePage,
@@ -243,15 +249,12 @@ export default class Navigator extends React.Component {
                     this.setState({ historyPages: new_historyPages });
                 }
 
-                if (!window.cordova)
+                if (this.state.changeRoute) {
 
                     window.location.href = window.location.href.substr(0,
                         window.location.href.lastIndexOf("/") + 1) +
                         "#" + (goToPage !== this.state.homePageKey ? goToPage : "");
-                else if (window.cordova.platformId === "browser")
-                    window.location.href = window.location.href.substr(0,
-                        window.location.href.lastIndexOf("/") + 1) +
-                        "#" + (goToPage !== this.state.homePageKey ? goToPage : "");
+                }
 
 
                 //----navigator and animation----///
@@ -300,7 +303,7 @@ export default class Navigator extends React.Component {
 
     componentWillMount() {
         const fthis = this;
-        if (fthis.state.mobileMode) {
+        if (!fthis.state.changeRoute) {
 
             // //---lock portrait
             // window.screen.orientation.lock('portrait');
@@ -359,7 +362,6 @@ export default class Navigator extends React.Component {
             ? this.props.children.map(child => {
                 return <div
                     onTouchStart={(e) => {
-                        
                         if (child.props.backOnSwipeRight) {
                             if (e.touches[0].clientX < (0.20 * innerWidth)) {
                                 fthis.touchBackPage = nowPage;