Skip to content

Commit e6cd2ee

Browse files
ceilinoceilino
committed
Updated to latest version of EZP
Remove hiding of lens/tints from hiding of zoom, since it disturbs with ezp methods. Version Bump
1 parent 26715c3 commit e6cd2ee

4 files changed

Lines changed: 23 additions & 22 deletions

File tree

‎bower.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-ez-plus",
3-
"version": "1.1.16",
3+
"version": "1.1.17",
44
"author": {
55
"name": "Igor Lino",
66
"url": "http://igorlino.github.io/angular-elevatezoom-plus/"
@@ -27,7 +27,7 @@
2727
"dependencies": {
2828
"jquery": "~2.1.1",
2929
"angular": "~1.3.4",
30-
"ez-plus": "~1.1.16"
30+
"ez-plus": "~1.1.17"
3131
},
3232
"devDependencies": {
3333
},

‎demo/index.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<link rel="stylesheet" href="https://rawgit.com/igorlino/elevatezoom-plus/master/css/jquery.ez-plus.css"/>
3030
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.js"></script>
31-
<script src='https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.16/src/jquery.ez-plus.js'></script>
31+
<script src='https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.17/src/jquery.ez-plus.js'></script>
3232

3333
<script type="text/javascript"
3434
src="http://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"></script>
@@ -46,19 +46,19 @@
4646

4747
<!--
4848
49-
<link rel="stylesheet" type="text/css" href="https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.16/demo/css/style.css" media="screen" />
50-
<script src='https://cdn.rawgit.com/igorlino/angular-elevatezoom-plus/1.1.16/js/angular-ezplus.js'></script>
51-
<script src='https://cdn.rawgit.com/igorlino/angular-elevatezoom-plus/1.1.16/demo/js/controller.js'></script>
52-
<script src='https://cdn.rawgit.com/igorlino/angular-elevatezoom-plus/1.1.16/demo/js/app.js'></script>
49+
<link rel="stylesheet" type="text/css" href="https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.17/demo/css/style.css" media="screen" />
50+
<script src='https://cdn.rawgit.com/igorlino/angular-elevatezoom-plus/1.1.17/js/angular-ezplus.js'></script>
51+
<script src='https://cdn.rawgit.com/igorlino/angular-elevatezoom-plus/1.1.17/demo/js/controller.js'></script>
52+
<script src='https://cdn.rawgit.com/igorlino/angular-elevatezoom-plus/1.1.17/demo/js/app.js'></script>
5353
-->
5454

5555
<link rel="stylesheet" type="text/css" href="css/style.css" media="screen"/>
5656
<script src='../js/angular-ezplus.js'></script>
57-
<script src='js/controller.js'></script>
57+
<script src='js/controller.js'></script>^
5858
<script src='js/app.js'></script>
5959

60-
<link type="text/css" rel="stylesheet" href="https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.16/demo/css/prism.css"/>
61-
<script type="text/javascript" src="https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.16/demo/js/prism.js"></script>
60+
<link type="text/css" rel="stylesheet" href="https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.17/demo/css/prism.css"/>
61+
<script type="text/javascript" src="https://cdn.rawgit.com/igorlino/elevatezoom-plus/1.1.17/demo/js/prism.js"></script>
6262
</head>
6363

6464
<body

‎js/angular-ezplus.js‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,19 @@
7878
loader = options.loader;
7979
}
8080

81-
$scope.$on("ezp-hidesAll", function (e, msg) {
81+
$scope.$on('ezp-hidesAll', function (e, msg) {
8282
hideZoom();
8383
});
84-
$scope.$on("ezp-showAll", function (e, msg) {
84+
$scope.$on('ezp-showAll', function (e, msg) {
8585
showZoom();
8686
});
87-
$scope.$on("ezp-disableZoom", function (e, msg) {
87+
$scope.$on('ezp-disableZoom', function (e, msg) {
8888
var plugin = angular.element($element).data('ezPlus');
8989
if (plugin) {
9090
plugin.changeState('disable');
9191
}
9292
});
93-
$scope.$on("ezp-enableZoom", function (e, msg) {
93+
$scope.$on('ezp-enableZoom', function (e, msg) {
9494
var plugin = angular.element($element).data('ezPlus');
9595
if (plugin) {
9696
plugin.changeState('enable');
@@ -151,22 +151,23 @@
151151
});
152152

153153
function hideZoom() {
154-
var action='hide';
154+
var action = 'hide';
155155
var plugin = angular.element($element).data('ezPlus');
156156
if (plugin) {
157157
plugin.showHideZoomContainer(action);
158-
plugin.showHideWindow(action);
158+
/*plugin.showHideWindow(action);
159159
plugin.showHideTint(action);
160-
plugin.showHideLens(action);
160+
plugin.showHideLens(action);*/
161161
}
162162
}
163+
163164
function showZoom() {
164-
var action='show';
165+
var action = 'show';
165166
var plugin = angular.element($element).data('ezPlus');
166167
if (plugin) {
167-
plugin.showHideLens(action);
168+
/*plugin.showHideLens(action);
168169
plugin.showHideTint(action);
169-
plugin.showHideWindow(action);
170+
plugin.showHideWindow(action);*/
170171
plugin.showHideZoomContainer(action);
171172
}
172173
}

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-ez-plus",
3-
"version": "1.1.16",
3+
"version": "1.1.17",
44
"title": "Angular EZ Plus",
55
"description": "Angular directive for ElevateZoom Plus.",
66
"keywords": [
@@ -32,7 +32,7 @@
3232
"dependencies": {
3333
"jquery": ">=2.1.4",
3434
"angular": "~1.3.4",
35-
"ez-plus": "~1.1.16"
35+
"ez-plus": "~1.1.17"
3636
},
3737
"devDependencies": {
3838
"grunt": "^0.4.5",

0 commit comments

Comments
 (0)