Merge pull request #113 from jonataswalker/v2.5.0

Release v2.5.0

Author: jonataswalker

README.md

@@ -1,4 +1,4 @@
-# OpenLayers 3 Custom Context Menu
+# OpenLayers Custom Context Menu
 
 <p align="center">
   <a href="https://travis-ci.org/jonataswalker/ol3-contextmenu">
@@ -21,12 +21,12 @@
   </a>
 </p>
 
-A `contextmenu` extension for [OpenLayers 3](http://openlayers.org/). **Requires** OpenLayers **v3.11.0** or higher.
+A `contextmenu` extension for [OpenLayers](http://openlayers.org/). **Requires** OpenLayers **v3.11.0** or higher.
 
 ![contextmenu anim](https://raw.githubusercontent.com/jonataswalker/ol3-contextmenu/screenshot/images/anim.gif)
 
 ## Demo
-You can see [here a demo](http://rawgit.com/jonataswalker/ol3-contextmenu/master/examples/contextmenu.html) or [JSFiddle](http://jsfiddle.net/jonataswalker/ooxs1w5d/).
+You can see [here a demo](http://rawgit.com/jonataswalker/ol3-contextmenu/master/examples/contextmenu.html) or [JSFiddle](https://jsfiddle.net/jonataswalker/ooxs1w5d/).
 
 ## How to use it?
 ##### CDN Hosted - [jsDelivr](http://www.jsdelivr.com/projects/openlayers.contextmenu)

build/ol3-contextmenu-debug.js

@@ -1,8 +1,8 @@
 /*!
- * ol3-contextmenu - v2.4.1
- * Custom Context Menu for Openlayers 3
+ * ol3-contextmenu - v2.5.0
+ * Custom Context Menu for Openlayers
  * https://github.com/jonataswalker/ol3-contextmenu
- * Built: Fri Jan 27 2017 07:46:19 GMT-0200 (BRST)
+ * Built: Fri Feb 24 2017 15:11:20 GMT-0300 (BRT)
  */
 
 (function (global, factory) {
@@ -76,37 +76,24 @@ var defaultItems = [
     text: 'Zoom In',
     classname: [CLASSNAME.zoomIn, CLASSNAME.icon].join(' '),
     callback: function (obj, map) {
-      var view = map.getView(),
-          pan = ol.animation.pan({
-            duration: 1000,
-            source: view.getCenter()
-          }),
-          zoom = ol.animation.zoom({
-            duration: 1000,
-            resolution: view.getResolution()
-          });
-
-      map.beforeRender(pan, zoom);
-      view.setCenter(obj.coordinate);
-      view.setZoom(+view.getZoom() + 1);
+      var view = map.getView();
+      view.animate({
+        zoom: +view.getZoom() + 1,
+        duration: 700,
+        center: obj.coordinate
+      });
     }
   },
   {
     text: 'Zoom Out',
     classname: [CLASSNAME.zoomOut, CLASSNAME.icon].join(' '),
     callback: function (obj, map) {
-      var view = map.getView(),
-          pan = ol.animation.pan({
-            duration: 1000,
-            source: view.getCenter()
-          }),
-          zoom = ol.animation.zoom({
-            duration: 1000,
-            resolution: view.getResolution()
-          });
-      map.beforeRender(pan, zoom);
-      view.setCenter(obj.coordinate);
-      view.setZoom(+view.getZoom() - 1);
+      var view = map.getView();
+      view.animate({
+        zoom: +view.getZoom() - 1,
+        duration: 700,
+        center: obj.coordinate
+      });
     }
   }
 ];
@@ -391,7 +378,7 @@ var Internal = function Internal(base) {
   /**
     * @type {Element}
     */
-  this.mapElement = undefined;
+  this.viewport = undefined;
   /**
     * @type {ol.Coordinate}
     */
@@ -428,7 +415,7 @@ var Internal = function Internal(base) {
 
 Internal.prototype.init = function init (map) {
   this.map = map;
-  this.mapElement = map.getTargetElement();
+  this.viewport = map.getViewport();
   this.setListeners();
   this.Base.Html.createMenu();
 
@@ -537,12 +524,12 @@ Internal.prototype.closeMenu = function closeMenu () {
 };
 
 Internal.prototype.setListeners = function setListeners () {
-  this.mapElement.addEventListener(
+  this.viewport.addEventListener(
       this.Base.options.eventType, this.eventHandler, false);
 };
 
 Internal.prototype.removeListeners = function removeListeners () {
-  this.mapElement.removeEventListener(
+  this.viewport.removeEventListener(
       this.Base.options.eventType, this.eventHandler, false);
 };
 

build/ol3-contextmenu.css

@@ -1,8 +1,8 @@
 /*!
- * ol3-contextmenu - v2.4.1
- * Custom Context Menu for Openlayers 3
+ * ol3-contextmenu - v2.5.0
+ * Custom Context Menu for Openlayers
  * https://github.com/jonataswalker/ol3-contextmenu
- * Built: Fri Jan 27 2017 07:46:22 GMT-0200 (BRST)
+ * Built: Fri Feb 24 2017 15:11:23 GMT-0300 (BRT)
  */
 .ol-ctx-menu-container {
   position: absolute;

build/ol3-contextmenu.js

@@ -1,7 +1,7 @@
 {
   "name": "ol3-contextmenu",
-  "version": "2.4.1",
-  "description": "Custom Context Menu for Openlayers 3",
+  "version": "2.5.0",
+  "description": "Custom Context Menu for Openlayers",
   "main": "build/ol3-contextmenu.js",
   "author": "Jonatas Walker",
   "homepage": "https://github.com/jonataswalker/ol3-contextmenu",