introduced jqmCompatMode in , which is also able to deactivate jqm ha…

…sh listening and changing
opitzconsulting · Jul 5, 2012 · 73a21da · 73a21da
1 parent 8d2bedc
commit 73a21da
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/...bapp/integration/plainLocationProvider.js → ...webapp/integration/ngmLocationProvider.js b/...bapp/integration/plainLocationProvider.js → ...webapp/integration/ngmLocationProvider.js
@@ -207,27 +207,27 @@
 
     var ng = angular.module("ng");
     ng.config(['$locationProvider', function ($locationProvider) {
-        var plainMode = true;
+        var jqmCompatMode = true;
         /**
          * @ngdoc property
-         * @name ng.$locationProvider#plainMode
+         * @name ng.$locationProvider#jqmCompatMode
          * @methodOf ng.$locationProvider
          * @description
-         * @param {string=} mode Use plain strategy.
+         * @param {string=} mode Use jqm compatibility mode for navigation.
          * @returns {*} current value if used as getter or itself (chaining) if used as setter
          */
-        $locationProvider.plainMode = function (mode) {
+        $locationProvider.jqmCompatMode = function (mode) {
             if (angular.isDefined(mode)) {
-                plainMode = mode;
+                jqmCompatMode = mode;
                 return this;
             } else {
-                return plainMode;
+                return jqmCompatMode;
             }
         };
 
         var _$get = $locationProvider.$get;
         $locationProvider.$get = ['$injector', '$sniffer', '$browser', function ($injector, $sniffer, $browser) {
-            if (plainMode) {
+            if (jqmCompatMode) {
                 // Angular should not use the history api and use the hash bang location service,
                 // which we will extend below.
                 $sniffer.history = false;
@@ -239,6 +239,11 @@
 
                 return $location;
             } else {
+                // deactivate jqm hash listening and changing
+                $.mobile.pushStateEnabled = false;
+                $.mobile.hashListeningEnabled = false;
+                $.mobile.changePage.defaults.changeHash = false;
+
                 return $injector.invoke(_$get, $locationProvider);
             }
         }];

diff --git a/.../integration/angularUrlIntegrationSpec.js → ...ebapp/ui/integration/ngmLocationUiSpec.js b/.../integration/angularUrlIntegrationSpec.js → ...ebapp/ui/integration/ngmLocationUiSpec.js
diff --git a/...app/unit/integration/plainLocationSpec.js → ...ebapp/unit/integration/ngmLocationSpec.js b/...app/unit/integration/plainLocationSpec.js → ...ebapp/unit/integration/ngmLocationSpec.js