Adds behavior support.

As in older versions of jhere, it is now possible to switch on and off the map behavior (zoom and drag).
mmarcon · Nov 22, 2015 · 4fecf30 · 4fecf30
1 parent 337a34b
commit 4fecf30
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 12 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -163,7 +163,15 @@ module.exports = function(grunt) {
                 },
                 {
                     from: '../dist/jhere.js',
-                    to: 'https://cdn.rawgit.com/mmarcon/jhere/jsla3/dist/jhere.js'
+                    to: 'https://cdn.rawgit.com/mmarcon/jhere/jsla3/dist/jhere.min.js'
+                },
+                {
+                    from: '../out/jhere.min.js',
+                    to: 'https://cdn.rawgit.com/mmarcon/jhere/jsla3/dist/jhere.min.js'
+                },
+                {
+                    from: '../out/jhere.js',
+                    to: 'https://cdn.rawgit.com/mmarcon/jhere/jsla3/dist/jhere.min.js'
                 }]
             }
         }

diff --git a/dist/jhere.js b/dist/jhere.js
@@ -202,7 +202,7 @@
 	 *                                                     app_code: 'your_app_code'
 	 *                                                     zoom: 14,
 	 *                                                     center: {lat: 52.5, lng: 13.3,
-	 *                                                     enable: ['zoombar', 'scalebar', 'settings']
+	 *                                                     enable: ['zoombar', 'scalebar', 'settings', 'behavior']
 	 *                                                 }});
 	 *
 	 * @link https://developer.here.com/myapps
@@ -270,9 +270,12 @@
 	    if (! ~enabled.indexOf('settings')) {
 	        self.ui.getControl('mapsettings').setVisibility(false);
 	    }
+	    if (~enabled.indexOf('behavior')) {
+	        //TODO: consider more granulr control over behavior
+	        //{enabled: Behavior.DRAGGING | Behavior.WHEELZOOM | Behavior.DBLTAPZOOM}
+	        new Behavior(new H.mapevents.MapEvents(self.map));
+	    }
 
-	    //TODO: look at the options {enabled: Behavior.DRAGGING, Behavior.WHEELZOOM, Behavior.DBLTAPZOOM}
-	    new Behavior(new H.mapevents.MapEvents(self.map));
 	    self.mc = new H.map.Group();
 	    self.map.addObject(self.mc);
 	};
@@ -676,7 +679,7 @@
 	    zoom: 12,
 	    center: { lat: 52.49, lng: 13.37 },
 	    type: 'map',
-	    enable: ['zoombar', 'scalebar', 'settings']
+	    enable: ['zoombar', 'scalebar', 'settings', 'behavior']
 	};
 
 	exports.defaults = defaults;

diff --git a/dist/jhere.min.js b/dist/jhere.min.js
diff --git a/dist/jhere.zip b/dist/jhere.zip
diff --git a/examples/index.html b/examples/index.html
@@ -19,7 +19,7 @@
 <div id="map" class="map"></div>
 <div id="other_map" class="map"></div>
 
-<script src="../dist/jhere.min.js"></script>
+<script src="../out/jhere.js"></script>
 <script>
     /* globals jHERE: true */
     var map = jHERE(document.querySelector('#map'), {zoom: 14, center: {lat: 52.5, lng: 18.3}})

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jHERE",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "Maps made easy.",
   "main": "index.js",
   "directories": {

diff --git a/src/modules/config.js b/src/modules/config.js
@@ -34,7 +34,7 @@ export const defaults  = {
     zoom: 12,
     center: {lat: 52.49, lng: 13.37},
     type: 'map',
-    enable: ['zoombar', 'scalebar', 'settings']
+    enable: ['zoombar', 'scalebar', 'settings', 'behavior']
 };
 
 const pointer = 'pointer';

diff --git a/src/modules/core.js b/src/modules/core.js
@@ -38,7 +38,7 @@ const d = document;
  *                                                     app_code: 'your_app_code'
  *                                                     zoom: 14,
  *                                                     center: {lat: 52.5, lng: 13.3,
- *                                                     enable: ['zoombar', 'scalebar', 'settings']
+ *                                                     enable: ['zoombar', 'scalebar', 'settings', 'behavior']
  *                                                 }});
  *
  * @link https://developer.here.com/myapps
@@ -102,9 +102,12 @@ JH._makemap = function(){
     if(!~enabled.indexOf('settings')) {
         self.ui.getControl('mapsettings').setVisibility(false);
     }
+    if(~enabled.indexOf('behavior')) {
+        //TODO: consider more granulr control over behavior
+        //{enabled: Behavior.DRAGGING | Behavior.WHEELZOOM | Behavior.DBLTAPZOOM}
+        new Behavior(new H.mapevents.MapEvents(self.map));
+    }
 
-    //TODO: look at the options {enabled: Behavior.DRAGGING, Behavior.WHEELZOOM, Behavior.DBLTAPZOOM}
-    new Behavior(new H.mapevents.MapEvents(self.map));
     self.mc = new H.map.Group();
     self.map.addObject(self.mc);
 };