Merge fe3a324 into 6406373

Makefile

@@ -18,6 +18,7 @@ GMF_APPS_LIBS_JS_FILES += \
 	node_modules/jquery/dist/jquery.min.js \
 	node_modules/angular/angular.min.js \
 	node_modules/angular-gettext/dist/angular-gettext.min.js \
+	node_modules/angular-touch/angular-touch.min.js \
 	node_modules/bootstrap/dist/js/bootstrap.min.js \
 	node_modules/proj4/dist/proj4.js \
 	node_modules/d3/d3.min.js \

contribs/gmf/apps/appmodule.js

@@ -15,4 +15,4 @@ goog.require('gmf');
 /**
  * @type {!angular.Module}
  */
-var appModule = angular.module('app', [gmfModule.name]);
+var appModule = angular.module('app', [gmfModule.name, 'ngTouch']);

contribs/gmf/apps/mobile/index.html

@@ -26,7 +26,9 @@
         ng-click="mainCtrl.toggleRightNavVisibility()">
         <i class="fa fa-wrench"></i>
       </button>
-      <div class="overlay" ng-click="mainCtrl.hideNav()"></div>
+      <div class="overlay" ng-click="mainCtrl.hideNav()"
+           ng-swipe-left="mainCtrl.hideNav()"
+           ng-swipe-right="mainCtrl.hideNav()"></div>
       <button ngeo-mobile-geolocation=""
         ngeo-mobile-geolocation-map="::mainCtrl.map"
         ngeo-mobile-geolocation-options="::mainCtrl.mobileGeolocationOptions">
@@ -106,6 +108,7 @@
     <script src="../../../../node_modules/typeahead.js/dist/typeahead.bundle.js"></script>
     <script src="../../../../node_modules/proj4/dist/proj4-src.js" type="text/javascript"></script>
     <script src="../../../../node_modules/angular-gettext/dist/angular-gettext.js" type="text/javascript"></script>
+    <script src="../../../../node_modules/angular-touch/angular-touch.js" type="text/javascript"></script>
     <script src="../../../../node_modules/bootstrap/dist/js/bootstrap.js" type="text/javascript"></script>
     <script src="../../../../node_modules/d3/d3.min.js" type="text/javascript"></script>
     <script src="/@?main=mobile/js/mobile.js"></script>

contribs/gmf/less/mobile-nav.less

@@ -3,9 +3,10 @@
  */
 @duration: .3s;
 main {
-  position: relative;
+  position: fixed;
   background-color: @color3;
   box-shadow: 0px 0px 15px black;
+  width: 100%;
   height: 100%;
   z-index: @content-index;
   text-align: center;
@@ -22,7 +23,7 @@ main {
 
   .overlay {
     /* shadow layer visible when navigation is active */
-    position: fixed;
+    position: absolute;
     z-index: @above-content-index;
     height: 100%;
     width: 100%;

package.json

@@ -20,6 +20,7 @@
     "angular-mocks": "1.4.7",
     "angular-gettext": "2.1.0",
     "angular-gettext-tools": "2.1.2",
+    "angular-touch": "1.4.9",
     "bootstrap": "3.3.0",
     "clean-css": "2.2.7",
     "coveralls": "2.11.6",