Forgot to add the best part to the module…

brianpkelley · Jan 19, 2017 · d935d24 · d935d24
1 parent 6ff793c
commit d935d24
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 12 deletions.
diff --git a/demo/js/app.js b/demo/js/app.js
@@ -32,15 +32,7 @@
 		$mdColorPickerConfig.notations.order = ['rgb', 'hsl', 'text', 'hex'];
 
 
-		$mdColorPickerConfig.tabs.add({
-			name: 'wheel',
-			icon: 'wheel.svg',
-			template: [
-				'<div md-color-picker-wheel></div>',
-				'<div md-color-picker-value ng-class="{\'md-color-picker-wide\': false && !mdColorAlphaChannel}"></div>',
-				'<div md-color-picker-alpha class="md-color-picker-checkered-bg" ng-if="true || mdColorAlphaChannel"></div>'
-			].join('\n')
-		}, 'push');
+
 
 
 	}])

diff --git a/dist/mdColorPicker.js b/dist/mdColorPicker.js
@@ -753,7 +753,7 @@ var dateClick;
 				 * @member $mdColorPickerConfig#tabs#order
 				 * @default [ 'spectrum',]
  				 */
- 				order: [ 'spectrum', 'colorSliders' ] // [ 'spectrum', 'wheel', 'rgbSliders', 'palette', 'material', 'history' ];
+ 				order: [ 'spectrum', 'wheel', 'colorSliders', 'material', 'history' ] // [ 'spectrum', 'wheel', 'rgbSliders', 'palette', 'material', 'history' ];
  			};
 
 
@@ -779,6 +779,15 @@ var dateClick;
  				}
  			});
 
+			$mdColorPickerConfig.tabs.add({
+				name: 'wheel',
+				icon: 'wheel.svg',
+				template: [
+					'<div md-color-picker-wheel></div>',
+					'<div md-color-picker-value ng-class="{\'md-color-picker-wide\': false && !mdColorAlphaChannel}"></div>',
+					'<div md-color-picker-alpha class="md-color-picker-checkered-bg" ng-if="true || mdColorAlphaChannel"></div>'
+				].join('\n')
+			}, 'push');
 
 
 			this.defaults = {

diff --git a/dist/mdColorPicker.min.js b/dist/mdColorPicker.min.js
@@ -759,7 +759,7 @@ var dateClick;
 				 * @member $mdColorPickerConfig#tabs#order
 				 * @default [ 'spectrum',]
  				 */
- 				order: [ 'spectrum', 'colorSliders' ] // [ 'spectrum', 'wheel', 'rgbSliders', 'palette', 'material', 'history' ];
+ 				order: [ 'spectrum', 'wheel', 'colorSliders', 'material', 'history' ] // [ 'spectrum', 'wheel', 'rgbSliders', 'palette', 'material', 'history' ];
  			};
 
 
@@ -785,6 +785,15 @@ var dateClick;
  				}
  			});
 
+			$mdColorPickerConfig.tabs.add({
+				name: 'wheel',
+				icon: 'wheel.svg',
+				template: [
+					'<div md-color-picker-wheel></div>',
+					'<div md-color-picker-value ng-class="{\'md-color-picker-wide\': false && !mdColorAlphaChannel}"></div>',
+					'<div md-color-picker-alpha class="md-color-picker-checkered-bg" ng-if="true || mdColorAlphaChannel"></div>'
+				].join('\n')
+			}, 'push');
 
 
 			this.defaults = {

diff --git a/src/js/mdColorPickerConfig.js b/src/js/mdColorPickerConfig.js
@@ -231,7 +231,7 @@
 				 * @member $mdColorPickerConfig#tabs#order
 				 * @default [ 'spectrum',]
  				 */
- 				order: [ 'spectrum', 'colorSliders' ] // [ 'spectrum', 'wheel', 'rgbSliders', 'palette', 'material', 'history' ];
+ 				order: [ 'spectrum', 'wheel', 'colorSliders', 'material', 'history' ] // [ 'spectrum', 'wheel', 'rgbSliders', 'palette', 'material', 'history' ];
  			};
 
 
@@ -257,6 +257,15 @@
  				}
  			});
 
+			$mdColorPickerConfig.tabs.add({
+				name: 'wheel',
+				icon: 'wheel.svg',
+				template: [
+					'<div md-color-picker-wheel></div>',
+					'<div md-color-picker-value ng-class="{\'md-color-picker-wide\': false && !mdColorAlphaChannel}"></div>',
+					'<div md-color-picker-alpha class="md-color-picker-checkered-bg" ng-if="true || mdColorAlphaChannel"></div>'
+				].join('\n')
+			}, 'push');
 
 
 			this.defaults = {