Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Commit

Permalink
3.0.2-wip: further changes to scheduler for repeat interval switching
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinparkerson committed Sep 12, 2014
1 parent 49f9186 commit b13b00f
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 31 deletions.
12 changes: 1 addition & 11 deletions dist/css/fuelux.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/fuelux.css.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/fuelux.min.css
View file

Large diffs are not rendered by default.

Binary file modified dist/fuelux.zip
View file
Binary file not shown.
29 changes: 19 additions & 10 deletions dist/js/fuelux.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2837,7 +2837,7 @@

populate: function( $el ) {
var self = this;
var $parent = $el.parent();
var $parent = ( $el.hasClass( 'tree' ) ) ? $el : $el.parent();
var loader = $parent.find( '.tree-loader:eq(0)' );

loader.removeClass( 'hide' );
Expand Down Expand Up @@ -2932,7 +2932,7 @@
} );
} else if ( $all[ 0 ] !== $el[ 0 ] ) {
$all.removeClass( 'tree-selected' )
.find( '.glyphicon' ).removeClass( 'glyphicon-ok' ).addClass( 'tree-dot' );
.find( '.glyphicon' ).removeClass( 'glyphicon-ok' ).addClass( 'fueluxicon-bullet' );
data.push( $el.data() );
}

Expand Down Expand Up @@ -5705,7 +5705,10 @@
'min': 1
} );
}
this.$endAfter.spinbox();
this.$endAfter.spinbox( {
'value': 1,
'min': 1
} );
this.$endDate.datepicker();
this.$element.find( '.radio-custom' ).radio();

Expand Down Expand Up @@ -6073,32 +6076,38 @@
}
item = 'weekly';
} else if ( recur.FREQ === 'MONTHLY' ) {
this.$element.find( '.repeat-monthly input' ).removeClass( 'checked' );
this.$element.find( '.repeat-monthly input' ).removeAttr( 'checked' ).removeClass( 'checked' );
this.$element.find( '.repeat-monthly label.radio-custom' ).removeClass( 'checked' );
if ( recur.BYMONTHDAY ) {
temp = this.$element.find( '.repeat-monthly-date' );
temp.find( 'input' ).addClass( 'checked' );
temp.find( '.select' ).selectlist( 'selectByValue', recur.BYMONTHDAY );
temp.find( 'input' ).addClass( 'checked' ).attr( 'checked', 'checked' );
temp.find( 'label.radio-custom' ).addClass( 'checked' );
temp.find( '.selectlist' ).selectlist( 'selectByValue', recur.BYMONTHDAY );
} else if ( recur.BYDAY ) {
temp = this.$element.find( '.repeat-monthly-day' );
temp.find( 'input' ).addClass( 'checked' );
temp.find( 'input' ).addClass( 'checked' ).attr( 'checked', 'checked' );
temp.find( 'label.radio-custom' ).addClass( 'checked' );
if ( recur.BYSETPOS ) {
temp.find( '.month-day-pos' ).selectlist( 'selectByValue', recur.BYSETPOS );
}
temp.find( '.month-days' ).selectlist( 'selectByValue', recur.BYDAY );
}
item = 'monthly';
} else if ( recur.FREQ === 'YEARLY' ) {
this.$element.find( '.repeat-yearly input' ).removeClass( 'checked' );
this.$element.find( '.repeat-yearly input' ).removeAttr( 'checked' ).removeClass( 'checked' );
this.$element.find( '.repeat-yearly label.radio-custom' ).removeClass( 'checked' );
if ( recur.BYMONTHDAY ) {
temp = this.$element.find( '.repeat-yearly-date' );
temp.find( 'input' ).addClass( 'checked' );
temp.find( 'input' ).addClass( 'checked' ).attr( 'checked', 'checked' );
temp.find( 'label.radio-custom' ).addClass( 'checked' );
if ( recur.BYMONTH ) {
temp.find( '.year-month' ).selectlist( 'selectByValue', recur.BYMONTH );
}
temp.find( '.year-month-day' ).selectlist( 'selectByValue', recur.BYMONTHDAY );
} else if ( recur.BYSETPOS ) {
temp = this.$element.find( '.repeat-yearly-day' );
temp.find( 'input' ).addClass( 'checked' );
temp.find( 'input' ).addClass( 'checked' ).attr( 'checked', 'checked' );
temp.find( 'label.radio-custom' ).addClass( 'checked' );
temp.find( '.year-month-day-pos' ).selectlist( 'selectByValue', recur.BYSETPOS );
if ( recur.BYDAY ) {
temp.find( '.year-month-days' ).selectlist( 'selectByValue', recur.BYDAY );
Expand Down
4 changes: 2 additions & 2 deletions dist/js/fuelux.min.js
View file

Large diffs are not rendered by default.

18 changes: 12 additions & 6 deletions js/scheduler.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,32 +451,38 @@
}
item = 'weekly';
}else if(recur.FREQ==='MONTHLY'){
this.$element.find('.repeat-monthly input, .repeat-monthly label.radio-custom').removeClass('checked');
this.$element.find('.repeat-monthly input').removeAttr('checked').removeClass('checked');
this.$element.find('.repeat-monthly label.radio-custom').removeClass('checked');
if(recur.BYMONTHDAY){
temp = this.$element.find('.repeat-monthly-date');
temp.find('input, label.radio-custom').addClass('checked');
temp.find('input').addClass('checked').attr('checked', 'checked');
temp.find('label.radio-custom').addClass('checked');
temp.find('.selectlist').selectlist('selectByValue', recur.BYMONTHDAY);
}else if(recur.BYDAY){
temp = this.$element.find('.repeat-monthly-day');
temp.find('input, label.radio-custom').addClass('checked');
temp.find('input').addClass('checked').attr('checked', 'checked');
temp.find('label.radio-custom').addClass('checked');
if(recur.BYSETPOS){
temp.find('.month-day-pos').selectlist('selectByValue', recur.BYSETPOS);
}
temp.find('.month-days').selectlist('selectByValue', recur.BYDAY);
}
item = 'monthly';
}else if(recur.FREQ==='YEARLY'){
this.$element.find('.repeat-yearly input').removeClass('checked');
this.$element.find('.repeat-yearly input').removeAttr('checked').removeClass('checked');
this.$element.find('.repeat-yearly label.radio-custom').removeClass('checked');
if(recur.BYMONTHDAY){
temp = this.$element.find('.repeat-yearly-date');
temp.find('input').addClass('checked');
temp.find('input').addClass('checked').attr('checked', 'checked');
temp.find('label.radio-custom').addClass('checked');
if(recur.BYMONTH){
temp.find('.year-month').selectlist('selectByValue', recur.BYMONTH);
}
temp.find('.year-month-day').selectlist('selectByValue', recur.BYMONTHDAY);
}else if(recur.BYSETPOS){
temp = this.$element.find('.repeat-yearly-day');
temp.find('input').addClass('checked');
temp.find('input').addClass('checked').attr('checked', 'checked');
temp.find('label.radio-custom').addClass('checked');
temp.find('.year-month-day-pos').selectlist('selectByValue', recur.BYSETPOS);
if(recur.BYDAY){
temp.find('.year-month-days').selectlist('selectByValue', recur.BYDAY);
Expand Down

0 comments on commit b13b00f

Please sign in to comment.