| @@ -10,21 +10,18 @@ | ||
| 10 | 10 | initialize: function () { |
| 11 | 11 | return api.Section.prototype.initialize.apply( this, arguments ); |
| 12 | 12 | }, |
| 13 | 13 | ready: function(){ |
| 14 | - var checked = this.container.find('input[name=loftloader-main-switch]').attr('checked') ? true : false; | |
| 15 | - checked ? '' : $('#customize-theme-controls').addClass('loftloader-settings-disabled'); | |
| 14 | + var checked = this.container.find('input[name=loftloader-main-switch]').is(':checked'); | |
| 15 | + checked ? '' : $( '#customize-theme-controls' ).addClass( 'loftloader-settings-disabled' ); | |
| 16 | 16 | $('#customize-theme-controls').addClass('loftloader-controls-wrapper'); |
| 17 | 17 | }, |
| 18 | 18 | attachEvents: function () { |
| 19 | 19 | var container = this.container; |
| 20 | 20 | container.on('change', 'input[name=loftloader-main-switch]', function(e){ |
| 21 | - var checked = $(this).attr('checked') ? true : false, | |
| 22 | - $element = container.find('#customize-control-loftloader_main_switch input[type=checkbox]'), | |
| 23 | - controls_wrap = $('#customize-theme-controls'); | |
| 21 | + var checked = $(this).is(':checked'), controls_wrap = $('#customize-theme-controls'); | |
| 24 | 22 | |
| 25 | - checked ? $element.attr('checked', 'checked') : $element.removeAttr('checked'); | |
| 26 | - $element.trigger('change'); | |
| 23 | + api( 'loftloader_main_switch' )( checked ); | |
| 27 | 24 | checked ? controls_wrap.removeClass('loftloader-settings-disabled') : controls_wrap.addClass('loftloader-settings-disabled'); |
| 28 | 25 | }); |
| 29 | 26 | } |
| 30 | 27 | }); |
| @@ -53,8 +50,35 @@ | ||
| 53 | 50 | // Change the site title in string "You are customizing ..." |
| 54 | 51 | loftloader_lite_i18n ? $('.site-title').text(loftloader_lite_i18n.name) : ''; |
| 55 | 52 | $('#loftloader-hide-site-title').remove(); |
| 56 | 53 | |
| 54 | + var current_url = document.createElement( 'a' ), current_search; | |
| 55 | + current_url.href = api.previewer.previewUrl(); | |
| 56 | + current_search = api.utils.parseQueryString( current_url.search.substr( 1 ) ); | |
| 57 | + api.previewer.unbind( 'url' ).bind( 'url', function( url ) { | |
| 58 | + var previewer = this, onUrlChange, urlChanged = false, urlParser; | |
| 59 | + urlParser = document.createElement( 'a' ); | |
| 60 | + urlParser.href = url; | |
| 61 | + urlParser.search = $.param( { 'plugin': 'loftloader-lite' } ); | |
| 62 | + url = urlParser.href; | |
| 63 | + previewer.scroll = 0; | |
| 64 | + onUrlChange = function() { | |
| 65 | + urlChanged = true; | |
| 66 | + }; | |
| 67 | + previewer.previewUrl.bind( onUrlChange ); | |
| 68 | + previewer.previewUrl.set( url ); | |
| 69 | + previewer.previewUrl.unbind( onUrlChange ); | |
| 70 | + if ( ! urlChanged ) { | |
| 71 | + previewer.refresh(); | |
| 72 | + } | |
| 73 | + } ); | |
| 74 | + if ( ! current_search['plugin'] ) { | |
| 75 | + current_search['plugin'] = 'loftloader-lite'; | |
| 76 | + current_url.search = $.param( current_search ); | |
| 77 | + api.previewer.previewUrl.set( current_url.href ); | |
| 78 | + } | |
| 79 | + | |
| 80 | + | |
| 57 | 81 | // Init for loader 2.0 customizer, when sync from lower version |
| 58 | 82 | var settings = api.get(), |
| 59 | 83 | $custom_img = $('#customize-control-loftloader_custom_img'); |
| 60 | 84 | if($custom_img.length && !$custom_img.find('.attachment-thumb').length && settings && settings['loftloader_custom_img']){ |
| @@ -73,13 +97,11 @@ | ||
| 73 | 97 | min = $(this).attr('min') ? parseInt($(this).attr('min')) : 1; |
| 74 | 98 | (val < min) ? $(this).val(min).trigger('change') : ''; |
| 75 | 99 | }) |
| 76 | 100 | .on('change', 'input.loftlader-checkbox', function(e){ |
| 77 | - var checked = $(this).attr('checked') ? true : false, | |
| 78 | - $element = $(this).siblings('input'); | |
| 79 | - if($element.length){ | |
| 80 | - checked ? $element.attr('checked', 'checked') : $element.removeAttr('checked'); | |
| 81 | - $element.trigger('change'); | |
| 101 | + var $element = $(this).siblings('input'); | |
| 102 | + if ( $element.length && $element.attr( 'data-customize-setting-link' ) ) { | |
| 103 | + api( $element.attr( 'data-customize-setting-link' ) )( $(this).is( ':checked' ) ); | |
| 82 | 104 | } |
| 83 | 105 | }) |
| 84 | 106 | .on('click', '.customize-more-toggle', function(e){ |
| 85 | 107 | e.preventDefault(); |