diff --git a/src/lib/data/html/speeddial.html b/src/lib/data/html/speeddial.html index fd36e2da2..ae9df9258 100644 --- a/src/lib/data/html/speeddial.html +++ b/src/lib/data/html/speeddial.html @@ -70,6 +70,20 @@ function addSpeedDial() function configureSpeedDial() { + // Load settings + $('#PgInRow').val(MAX_PAGES_ROW); + $('#sliderValuePg').html(MAX_PAGES_ROW); + $('#SdSize').val(DIAL_WIDTH); + $('#SdSizeToggle').prop('checked', DIAL_WIDTH != 240); + $('#sliderValueSd').html(DIAL_WIDTH); + $('#BgImgSelSiz').val('%B_SIZE%').attr('selected', 'selected'); + $('#BgImgToggle').prop('checked', "%IMG_BACKGROUND%" != ""); + $('#SdCntrToggle').prop('checked', SD_CENTER); + $('#BgImgToggle').is(':checked') ? $('#BgImgSel').removeAttr('disabled') : $('#BgImgSel').attr('disabled', 'disabled'); + $('#BgImgToggle').is(':checked') ? $('#BgImgSelSiz').removeAttr('disabled') : $('#BgImgSelSiz').attr('disabled', 'disabled'); + $('#SdSizeToggle').is(':checked') ? $('#SdSize').removeAttr('disabled') : $('#SdSize').attr('disabled', 'disabled'); + + // Show dialog $('#fadeOverlay2').css({'filter' : 'alpha(opacity=100)'}).fadeIn(); $('#fadeOverlay2').click(function() { $(this).fadeOut('slow'); }); $('#settingsBox').click(function(event) { event.stopPropagation(); }); @@ -346,11 +360,10 @@ function alignPage() { $("#quickdial").css('margin-top', margintop + 'px'); - $('#SdCntrToggle').prop('checked', SD_CENTER); - $('#quickdial div.entry').css({ - float: SD_CENTER ? 'none' : 'left', - display: SD_CENTER ? 'inline-block' : 'block' - }); + if (SD_CENTER) + enableCentering(); + else + diasableCentering(); } function bgImageSel() { @@ -411,15 +424,21 @@ function bgImgUpdate() { document.documentElement.style.backgroundSize = imgSize; } -$(document).ready(function () { - $('#BgImgSelSiz').val('%B_SIZE%').attr('selected','selected'); - $('#BgImgToggle').prop('checked', "%IMG_BACKGROUND%"!= ""); - $('#SdSizeToggle').prop('checked', DIAL_WIDTH != 240); - $('#SdCntrToggle').prop('checked', SD_CENTER); - $('#BgImgToggle').is(':checked') ? $('#BgImgSel').removeAttr('disabled') : $('#BgImgSel').attr('disabled', 'disabled'); - $('#BgImgToggle').is(':checked') ? $('#BgImgSelSiz').removeAttr('disabled') : $('#BgImgSelSiz').attr('disabled', 'disabled'); - $('#SdSizeToggle').is(':checked') ? $('#SdSize').removeAttr('disabled') : $('#SdSize').attr('disabled', 'disabled'); -}); +function enableCentering() +{ + $('#quickdial div.entry').css({ + float: 'none', + display: 'inline-block' + }); +} + +function disableCentering() +{ + $('#quickdial div.entry').css({ + float: 'left', + display: 'block' + }); +} @@ -450,6 +469,13 @@ function init() containment: 'document', opacity: 0.8, distance: 40, + start: function(event, ui) { + disableCentering(); + }, + stop: function(event, ui) { + if (SD_CENTER) + enableCentering(); + }, update: function(event, ui) { external.speedDial.changed(allPages()); } @@ -472,16 +498,16 @@ if (window.external) {
- %ROW-PAGES% - + +
 
 
- %SD-SIZE% - + +