Skip to content

Commit

Permalink
Late night commits always go smoothly
Browse files Browse the repository at this point in the history
  • Loading branch information
@brianpkelley
brianpkelley committed Jan 19, 2017
1 parent d935d24 commit d4d8ddd
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 51 deletions.
35 changes: 18 additions & 17 deletions dist/mdColorPicker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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' ];
};


Expand All @@ -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');


Expand Down Expand Up @@ -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) {
Expand Down
35 changes: 18 additions & 17 deletions dist/mdColorPicker.min.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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' ];
};


Expand All @@ -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');


Expand Down Expand Up @@ -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) {
Expand Down
14 changes: 7 additions & 7 deletions src/js/mdColorPickerConfig.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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' ];
};


Expand All @@ -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');


Expand Down
21 changes: 11 additions & 10 deletions src/js/tabs/materialPalette.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
// }])
;

0 comments on commit d4d8ddd

Please sign in to comment.