From d4d8ddd370cb7a37d350969d7a7b02e8c48f74fb Mon Sep 17 00:00:00 2001
From: Brian Kelley <brian.kelley@bettervideo.com>
Date: Wed, 18 Jan 2017 23:42:04 -0600
Subject: [PATCH] Late night commits always go smoothly

---
 dist/mdColorPicker.js          | 35 +++++++++++++++++-----------------
 dist/mdColorPicker.min.js      | 35 +++++++++++++++++-----------------
 src/js/mdColorPickerConfig.js  | 14 +++++++-------
 src/js/tabs/materialPalette.js | 21 ++++++++++----------
 4 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/dist/mdColorPicker.js b/dist/mdColorPicker.js
index af47e28..a590a8f 100644
--- a/dist/mdColorPicker.js
+++ b/dist/mdColorPicker.js
@@ -702,7 +702,7 @@ var dateClick;
 				 * $mdColorPickerConfig.tabs.add( spectrumTab );
  				 */
  				add: function( tab, addToOrder ) {
-
+					console.log( "ADD TAB", tab );
 					this.tabs_[ tab.name ] = tab;
 
 					addToOrder = addToOrder === undefined ? true : addToOrder;
@@ -753,7 +753,7 @@ var dateClick;
 				 * @member $mdColorPickerConfig#tabs#order
 				 * @default [ 'spectrum',]
  				 */
- 				order: [ 'spectrum', 'wheel', 'colorSliders', 'material', 'history' ] // [ 'spectrum', 'wheel', 'rgbSliders', 'palette', 'material', 'history' ];
+ 				order: [ 'spectrum', 'wheel', 'colorSliders' ] // [ 'spectrum', 'wheel', 'rgbSliders', 'palette', 'material', 'history' ];
  			};
 
 
@@ -779,14 +779,14 @@ var dateClick;
  				}
  			});
 
-			$mdColorPickerConfig.tabs.add({
+			this.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')
+							'<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');
 
 
@@ -2437,16 +2437,17 @@ angular.module('mdColorPicker')
 
 
 		}])
-		.run( ['$timeout','$mdColorPickerConfig', function( $timeout, $mdColorPickerConfig ) {
-			$timeout( function() {
-				$mdColorPickerConfig.tabs.order.push( 'materialPalette' );
-			}, 5000, true);
-
-			$timeout( function() {
-				var idx = $mdColorPickerConfig.tabs.order.indexOf( 'materialPalette' );
-				$mdColorPickerConfig.tabs.order.splice( idx, 1 );
-			}, 10000, true);
-		}]);
+		// .run( ['$timeout','$mdColorPickerConfig', function( $timeout, $mdColorPickerConfig ) {
+		// 	$timeout( function() {
+		// 		$mdColorPickerConfig.tabs.order.push( 'materialPalette' );
+		// 	}, 5000, true);
+		//
+		// 	$timeout( function() {
+		// 		var idx = $mdColorPickerConfig.tabs.order.indexOf( 'materialPalette' );
+		// 		$mdColorPickerConfig.tabs.order.splice( idx, 1 );
+		// 	}, 10000, true);
+		// }])
+		;
 }(window, window.angular, window.tinycolor));
 
 ;(function(window, angular, TinyColor, undefined) {
diff --git a/dist/mdColorPicker.min.js b/dist/mdColorPicker.min.js
index c6bfaad..f4d6412 100644
--- a/dist/mdColorPicker.min.js
+++ b/dist/mdColorPicker.min.js
@@ -708,7 +708,7 @@ var dateClick;
 				 * $mdColorPickerConfig.tabs.add( spectrumTab );
  				 */
  				add: function( tab, addToOrder ) {
-
+					console.log( "ADD TAB", tab );
 					this.tabs_[ tab.name ] = tab;
 
 					addToOrder = addToOrder === undefined ? true : addToOrder;
@@ -759,7 +759,7 @@ var dateClick;
 				 * @member $mdColorPickerConfig#tabs#order
 				 * @default [ 'spectrum',]
  				 */
- 				order: [ 'spectrum', 'wheel', 'colorSliders', 'material', 'history' ] // [ 'spectrum', 'wheel', 'rgbSliders', 'palette', 'material', 'history' ];
+ 				order: [ 'spectrum', 'wheel', 'colorSliders' ] // [ 'spectrum', 'wheel', 'rgbSliders', 'palette', 'material', 'history' ];
  			};
 
 
@@ -785,14 +785,14 @@ var dateClick;
  				}
  			});
 
-			$mdColorPickerConfig.tabs.add({
+			this.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')
+							'<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');
 
 
@@ -2443,16 +2443,17 @@ angular.module('mdColorPicker')
 
 
 		}])
-		.run( ['$timeout','$mdColorPickerConfig', function( $timeout, $mdColorPickerConfig ) {
-			$timeout( function() {
-				$mdColorPickerConfig.tabs.order.push( 'materialPalette' );
-			}, 5000, true);
-
-			$timeout( function() {
-				var idx = $mdColorPickerConfig.tabs.order.indexOf( 'materialPalette' );
-				$mdColorPickerConfig.tabs.order.splice( idx, 1 );
-			}, 10000, true);
-		}]);
+		// .run( ['$timeout','$mdColorPickerConfig', function( $timeout, $mdColorPickerConfig ) {
+		// 	$timeout( function() {
+		// 		$mdColorPickerConfig.tabs.order.push( 'materialPalette' );
+		// 	}, 5000, true);
+		//
+		// 	$timeout( function() {
+		// 		var idx = $mdColorPickerConfig.tabs.order.indexOf( 'materialPalette' );
+		// 		$mdColorPickerConfig.tabs.order.splice( idx, 1 );
+		// 	}, 10000, true);
+		// }])
+		;
 }(window, window.angular, window.tinycolor));
 
 ;(function(window, angular, TinyColor, undefined) {
diff --git a/src/js/mdColorPickerConfig.js b/src/js/mdColorPickerConfig.js
index a2ac47e..2a2fec1 100644
--- a/src/js/mdColorPickerConfig.js
+++ b/src/js/mdColorPickerConfig.js
@@ -180,7 +180,7 @@
 				 * $mdColorPickerConfig.tabs.add( spectrumTab );
  				 */
  				add: function( tab, addToOrder ) {
-
+					console.log( "ADD TAB", tab );
 					this.tabs_[ tab.name ] = tab;
 
 					addToOrder = addToOrder === undefined ? true : addToOrder;
@@ -231,7 +231,7 @@
 				 * @member $mdColorPickerConfig#tabs#order
 				 * @default [ 'spectrum',]
  				 */
- 				order: [ 'spectrum', 'wheel', 'colorSliders', 'material', 'history' ] // [ 'spectrum', 'wheel', 'rgbSliders', 'palette', 'material', 'history' ];
+ 				order: [ 'spectrum', 'wheel', 'colorSliders' ] // [ 'spectrum', 'wheel', 'rgbSliders', 'palette', 'material', 'history' ];
  			};
 
 
@@ -257,14 +257,14 @@
  				}
  			});
 
-			$mdColorPickerConfig.tabs.add({
+			this.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')
+							'<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/src/js/tabs/materialPalette.js b/src/js/tabs/materialPalette.js
index 79c69da..5ffd05f 100644
--- a/src/js/tabs/materialPalette.js
+++ b/src/js/tabs/materialPalette.js
@@ -60,13 +60,14 @@
 
 
 		}])
-		.run( ['$timeout','$mdColorPickerConfig', function( $timeout, $mdColorPickerConfig ) {
-			$timeout( function() {
-				$mdColorPickerConfig.tabs.order.push( 'materialPalette' );
-			}, 5000, true);
-
-			$timeout( function() {
-				var idx = $mdColorPickerConfig.tabs.order.indexOf( 'materialPalette' );
-				$mdColorPickerConfig.tabs.order.splice( idx, 1 );
-			}, 10000, true);
-		}]);
+		// .run( ['$timeout','$mdColorPickerConfig', function( $timeout, $mdColorPickerConfig ) {
+		// 	$timeout( function() {
+		// 		$mdColorPickerConfig.tabs.order.push( 'materialPalette' );
+		// 	}, 5000, true);
+		//
+		// 	$timeout( function() {
+		// 		var idx = $mdColorPickerConfig.tabs.order.indexOf( 'materialPalette' );
+		// 		$mdColorPickerConfig.tabs.order.splice( idx, 1 );
+		// 	}, 10000, true);
+		// }])
+		;