Merged js resources.

Removed unused resources.
igorlino · Jun 8, 2015 · 542d47d · 542d47d
1 parent 3a6f63c
commit 542d47d
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -27,8 +27,7 @@ In a browser:
 
 ```html
 <script src="jquery.ez-plus.js"></script>
-<script src="ezplus-module.js"></script>
-<script src="ezplus-directive.js"></script>
+<script src="angular-ezplus.js"></script>
 ```
 
 ## Getting Started

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-ez-plus",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "author": {
         "name": "Igor Lino",
         "url": "http://igorlino.github.io/angular-elevatezoom-plus/"
@@ -12,8 +12,7 @@
         }
     ],
     "main": [
-        "js/ezplus.module.js",
-        "js/ezplus.directive.js",
+        "js/angular-ezplus.js",
         "images/loader-small.gif"
     ],
     "ignore": [

diff --git a/demo/images/border.png b/demo/images/border.png
diff --git a/demo/images/controls.png b/demo/images/controls.png
diff --git a/demo/images/loading.gif b/demo/images/loading.gif
diff --git a/demo/images/loading_background.png b/demo/images/loading_background.png
diff --git a/demo/images/overlay.png b/demo/images/overlay.png
diff --git a/demo/index.html b/demo/index.html
@@ -41,10 +41,9 @@
     <script type="text/javascript" src="http://fancyapps.com/fancybox/source/jquery.fancybox.pack.js?v=2.1.5"></script>
     <link rel="stylesheet" type="text/css" href="http://fancyapps.com/fancybox/source/jquery.fancybox.css?v=2.1.5" media="screen" />
 
-    <!--script src='https://rawgit.com/igorlino/angular-elevatezoom-plus/master/js/ezplus.module.js'></script>
-    <script src='https://rawgit.com/igorlino/angular-elevatezoom-plus/master/js/ezplus.directive.js'></script>-->
-    <script src='../js/ezplus.module.js'></script>
-    <script src='../js/ezplus.directive.js'></script>
+    <!--<script src='https://rawgit.com/igorlino/angular-elevatezoom-plus/master/js/angular-ezplus.js'></script>
+    -->
+    <script src='../js/angular-ezplus.js'></script>
 
     <!--<script src='https://rawgit.com/igorlino/angular-elevatezoom-plus/master/demo/controller.js'></script>
     <script src='https://rawgit.com/igorlino/angular-elevatezoom-plus/master/demo/app.js'></script>-->

diff --git a/js/ezplus.directive.js → js/angular-ezplus.js b/js/ezplus.directive.js → js/angular-ezplus.js
@@ -1,7 +1,7 @@
 (function () {
     'use strict';
 
-    angular.module('ezplus')
+    angular.module('ezplus', [])
         .directive('ezPlus', ezPlus);
 
     function ezPlus() {

diff --git a/js/ezplus.module.js b/js/ezplus.module.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-ez-plus",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "title": "Angular EZ Plus",
     "description": "Angular directive for ElevateZoom Plus.",
     "keywords": [