Merge pull request #46 from sachinchoolur/45

45
sachinchoolur · Mar 3, 2018 · cfe6890 · cfe6890
2 parents b8fe8f4 + f2ad9fe
commit cfe6890
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 24 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "ngclipboard",
-    "version": "1.1.3",
+    "version": "2.0.0",
     "homepage": "https://github.com/sachinchoolur/ngclipboard",
     "license": "MIT",
     "authors": [
@@ -16,8 +16,8 @@
         "angularjs"
     ],
     "dependencies": {
-        "clipboard": "~1.5.5",
-        "angular": ">=1.2.0"
+        "clipboard": "^2.0.0",
+        "angular": "^1.2.0"
     },
     "ignore": [
         "README.md",

diff --git a/dist/ngclipboard.js b/dist/ngclipboard.js
@@ -1,19 +1,19 @@
-/*! ngclipboard - v1.1.3 - 2017-10-31
+/*! ngclipboard - v2.0.0 - 2018-03-03
 * https://github.com/sachinchoolur/ngclipboard
-* Copyright (c) 2017 Sachin; Licensed MIT */
+* Copyright (c) 2018 Sachin; Licensed MIT */
 (function() {
     'use strict';
     var MODULE_NAME = 'ngclipboard';
-    var angular, Clipboard;
-    
+    var angular, ClipboardJS;
+
     // Check for CommonJS support
     if (typeof module === 'object' && module.exports) {
       angular = require('angular');
-      Clipboard = require('clipboard');
+      ClipboardJS = require('clipboard');
       module.exports = MODULE_NAME;
     } else {
       angular = window.angular;
-      Clipboard = window.Clipboard;
+      ClipboardJS = window.ClipboardJS;
     }
 
     angular.module(MODULE_NAME, []).directive('ngclipboard', function() {
@@ -24,7 +24,8 @@
                 ngclipboardError: '&'
             },
             link: function(scope, element) {
-                var clipboard = new Clipboard(element[0]);
+                //constructor for clipboardjs changed to ClipboardJS
+                var clipboard = new ClipboardJS(element[0]);
 
                 clipboard.on('success', function(e) {
                   scope.$apply(function () {
@@ -41,7 +42,7 @@
                     });
                   });
                 });
-                
+
                 element.on('$destroy', function() {
                     clipboard.destroy();
                 });

diff --git a/dist/ngclipboard.min.js b/dist/ngclipboard.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ngclipboard",
-    "version": "1.1.3",
+    "version": "2.0.0",
     "description": "Angularjs directive for clipboard.js",
     "keywords": [
         "ngclipboard",
@@ -29,13 +29,13 @@
         "test": "grunt"
     },
     "dependencies": {
-        "clipboard": "~1.5.5"
+        "clipboard": "^2.0.0"
     },
     "peerDependencies": {
-        "angular": ">=1.2.0"
+        "angular": "^1.2.0"
     },
     "devDependencies": {
-        "angular": ">=1.2.0",
+        "angular": "^1.2.0",
         "grunt": "^0.4.5",
         "grunt-contrib-clean": "^0.6.0",
         "grunt-contrib-concat": "^0.5.0",

diff --git a/src/ngclipboard.js b/src/ngclipboard.js
@@ -1,16 +1,16 @@
 (function() {
     'use strict';
     var MODULE_NAME = 'ngclipboard';
-    var angular, Clipboard;
-    
+    var angular, ClipboardJS;
+
     // Check for CommonJS support
     if (typeof module === 'object' && module.exports) {
       angular = require('angular');
-      Clipboard = require('clipboard');
+      ClipboardJS = require('clipboard');
       module.exports = MODULE_NAME;
     } else {
       angular = window.angular;
-      Clipboard = window.Clipboard;
+      ClipboardJS = window.ClipboardJS;
     }
 
     angular.module(MODULE_NAME, []).directive('ngclipboard', function() {
@@ -21,7 +21,8 @@
                 ngclipboardError: '&'
             },
             link: function(scope, element) {
-                var clipboard = new Clipboard(element[0]);
+                //constructor for clipboardjs changed to ClipboardJS
+                var clipboard = new ClipboardJS(element[0]);
 
                 clipboard.on('success', function(e) {
                   scope.$apply(function () {
@@ -38,7 +39,7 @@
                     });
                   });
                 });
-                
+
                 element.on('$destroy', function() {
                     clipboard.destroy();
                 });