Updated to latest version of EZP

Remove hiding of lens/tints from hiding of zoom, since it disturbs with ezp methods. Version Bump
igorlino · Nov 14, 2015 · e6cd2ee · e6cd2ee
1 parent 26715c3
commit e6cd2ee
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 22 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-ez-plus",
-    "version": "1.1.16",
+    "version": "1.1.17",
     "author": {
         "name": "Igor Lino",
         "url": "http://igorlino.github.io/angular-elevatezoom-plus/"
@@ -27,7 +27,7 @@
     "dependencies": {
         "jquery": "~2.1.1",
         "angular": "~1.3.4",
-        "ez-plus": "~1.1.16"
+        "ez-plus": "~1.1.17"
     },
     "devDependencies": {
     },

diff --git a/demo/index.html b/demo/index.html
@@ -28,7 +28,7 @@
 
     <link rel="stylesheet" href="https://rawgit.com/igorlino/elevatezoom-plus/master/css/jquery.ez-plus.css"/>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.js"></script>
-    <script src='https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.16/src/jquery.ez-plus.js'></script>
+    <script src='https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.17/src/jquery.ez-plus.js'></script>
 
     <script type="text/javascript"
             src="http://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"></script>
@@ -46,19 +46,19 @@
 
     <!--
 
-    <link rel="stylesheet" type="text/css" href="https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.16/demo/css/style.css" media="screen" />
-    <script src='https://cdn.rawgit.com/igorlino/angular-elevatezoom-plus/1.1.16/js/angular-ezplus.js'></script>
-    <script src='https://cdn.rawgit.com/igorlino/angular-elevatezoom-plus/1.1.16/demo/js/controller.js'></script>
-    <script src='https://cdn.rawgit.com/igorlino/angular-elevatezoom-plus/1.1.16/demo/js/app.js'></script>
+    <link rel="stylesheet" type="text/css" href="https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.17/demo/css/style.css" media="screen" />
+    <script src='https://cdn.rawgit.com/igorlino/angular-elevatezoom-plus/1.1.17/js/angular-ezplus.js'></script>
+    <script src='https://cdn.rawgit.com/igorlino/angular-elevatezoom-plus/1.1.17/demo/js/controller.js'></script>
+    <script src='https://cdn.rawgit.com/igorlino/angular-elevatezoom-plus/1.1.17/demo/js/app.js'></script>
     -->
 
     <link rel="stylesheet" type="text/css" href="css/style.css" media="screen"/>
     <script src='../js/angular-ezplus.js'></script>
-    <script src='js/controller.js'></script>
+    <script src='js/controller.js'></script>^
     <script src='js/app.js'></script>
 
-    <link type="text/css" rel="stylesheet" href="https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.16/demo/css/prism.css"/>
-    <script type="text/javascript" src="https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.16/demo/js/prism.js"></script>
+    <link type="text/css" rel="stylesheet" href="https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.17/demo/css/prism.css"/>
+    <script type="text/javascript" src="https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.17/demo/js/prism.js"></script>
 </head>
 
 <body

diff --git a/js/angular-ezplus.js b/js/angular-ezplus.js
@@ -78,19 +78,19 @@
                 loader = options.loader;
             }
 
-            $scope.$on("ezp-hidesAll", function (e, msg) {
+            $scope.$on('ezp-hidesAll', function (e, msg) {
                 hideZoom();
             });
-            $scope.$on("ezp-showAll", function (e, msg) {
+            $scope.$on('ezp-showAll', function (e, msg) {
                 showZoom();
             });
-            $scope.$on("ezp-disableZoom", function (e, msg) {
+            $scope.$on('ezp-disableZoom', function (e, msg) {
                 var plugin = angular.element($element).data('ezPlus');
                 if (plugin) {
                     plugin.changeState('disable');
                 }
             });
-            $scope.$on("ezp-enableZoom", function (e, msg) {
+            $scope.$on('ezp-enableZoom', function (e, msg) {
                 var plugin = angular.element($element).data('ezPlus');
                 if (plugin) {
                     plugin.changeState('enable');
@@ -151,22 +151,23 @@
             });
 
             function hideZoom() {
-                var action='hide';
+                var action = 'hide';
                 var plugin = angular.element($element).data('ezPlus');
                 if (plugin) {
                     plugin.showHideZoomContainer(action);
-                    plugin.showHideWindow(action);
+                    /*plugin.showHideWindow(action);
                     plugin.showHideTint(action);
-                    plugin.showHideLens(action);
+                    plugin.showHideLens(action);*/
                 }
             }
+
             function showZoom() {
-                var action='show';
+                var action = 'show';
                 var plugin = angular.element($element).data('ezPlus');
                 if (plugin) {
-                    plugin.showHideLens(action);
+                    /*plugin.showHideLens(action);
                     plugin.showHideTint(action);
-                    plugin.showHideWindow(action);
+                    plugin.showHideWindow(action);*/
                     plugin.showHideZoomContainer(action);
                 }
             }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-ez-plus",
-    "version": "1.1.16",
+    "version": "1.1.17",
     "title": "Angular EZ Plus",
     "description": "Angular directive for ElevateZoom Plus.",
     "keywords": [
@@ -32,7 +32,7 @@
     "dependencies": {
         "jquery": ">=2.1.4",
         "angular": "~1.3.4",
-        "ez-plus": "~1.1.16"
+        "ez-plus": "~1.1.17"
     },
     "devDependencies": {
         "grunt": "^0.4.5",