Merge branch 'release/1.0.2'

crowdcomms · Mar 29, 2018 · a67e179 · a67e179
2 parents 94f5151 + 664c14a
commit a67e179
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/dist/mdRainbow.js b/dist/mdRainbow.js
@@ -512,6 +512,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 				clickOutsideToClose: '=?',
 				skipHide: '=?',
 				preserveScope: '=?',
+				multiple: '=?',
 
 				// Advanced options
 				mdColorClearButton: '=?',
@@ -609,6 +610,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 						hasBackdrop: $scope.hasBackdrop,
 						skipHide: $scope.skipHide,
 						preserveScope: $scope.preserveScope,
+						multiple: $scope.multiple,
 
 						mdColorAlphaChannel: $scope.mdColorAlphaChannel,
 						mdColorSpectrum: $scope.mdColorSpectrum,
@@ -904,6 +906,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 				options.focusOnOpen = options.focusOnOpen === undefined ? false : options.focusOnOpen;
 				options.preserveScope = options.preserveScope === undefined ? true : options.preserveScope;
 				options.skipHide = options.skipHide === undefined ? true : options.skipHide;
+				options.multiple = options.multiple === undefined ? true : options.multiple;
 
 				// mdRainbow Properties
 				options.mdColorAlphaChannel = options.mdColorAlphaChannel === undefined ? false : options.mdColorAlphaChannel;
@@ -921,6 +924,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 					template: _mdRainbowDialog2.default,
 					hasBackdrop: options.hasBackdrop,
 					clickOutsideToClose: options.clickOutsideToClose,
+					multiple: options.multiple,
 
 					controller: ['$scope', 'options', function ($scope, options) {
 						//console.log( "DIALOG CONTROLLER OPEN", Date.now() - dateClick );

diff --git a/package.json b/package.json
@@ -1,8 +1,11 @@
 {
   "name": "md-rainbow",
-  "version": "1.0.1",
-  "description": "md-color-picker inspired color picker.",
+  "version": "1.0.2",
+  "description": "Continuation of md-color-picker.",
   "main": "dist/mdRainbow.js",
+  "scripts": {
+    "build": "webpack --progress --colors"
+  },
   "dependencies": {
     "tinycolor2": "*"
   },
@@ -46,9 +49,6 @@
     "webpack": "2.3.2",
     "webpack-dev-server": "2.4.2"
   },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/hayzey/md-rainbow"

diff --git a/src/js/mdRainbow.js b/src/js/mdRainbow.js
@@ -454,6 +454,7 @@ angular.module('mdRainbow', [])
 				clickOutsideToClose: '=?',
 				skipHide: '=?',
 				preserveScope: '=?',
+				multiple: '=?',
 
 				// Advanced options
 				mdColorClearButton: '=?',
@@ -551,6 +552,7 @@ angular.module('mdRainbow', [])
 						hasBackdrop: $scope.hasBackdrop,
 						skipHide: $scope.skipHide,
 						preserveScope: $scope.preserveScope,
+						multiple: $scope.multiple,
 
 						mdColorAlphaChannel: $scope.mdColorAlphaChannel,
 						mdColorSpectrum: $scope.mdColorSpectrum,
@@ -878,6 +880,7 @@ angular.module('mdRainbow', [])
 				options.focusOnOpen = options.focusOnOpen === undefined ? false : options.focusOnOpen;
 				options.preserveScope = options.preserveScope === undefined ? true : options.preserveScope;
 				options.skipHide = options.skipHide === undefined ? true : options.skipHide;
+				options.multiple = options.multiple === undefined ? true : options.multiple;
 
 				// mdRainbow Properties
 				options.mdColorAlphaChannel = options.mdColorAlphaChannel === undefined ? false : options.mdColorAlphaChannel;
@@ -895,6 +898,7 @@ angular.module('mdRainbow', [])
 					template: mdRainbowDialogTemplate,
 					hasBackdrop: options.hasBackdrop,
 					clickOutsideToClose: options.clickOutsideToClose,
+                    multiple: options.multiple,
 
 					controller: ['$scope', 'options', function( $scope, options ) {
 							//console.log( "DIALOG CONTROLLER OPEN", Date.now() - dateClick );