Index: core/admin_templates/js/template_manager.js IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/admin_templates/js/template_manager.js (revision 15908) +++ core/admin_templates/js/template_manager.js (revision ) @@ -120,76 +120,76 @@ } // related to content revision control toolbar - $('#cms-toggle-revision-toolbar').click( - function ($e) { + if ( $('#cms-revision-toolbar-layer').length == 1 ) { + $template_manager.initRevisionToolbar(); + } + } + ); +} + +TemplateManager.prototype.initRevisionToolbar = function () { + var $template_manager = this; + + $('#cms-toggle-revision-toolbar').click(function ($e) { - var $me = $(this); + var $me = $(this); - if ( $me.hasClass('opened') ) { - var $height = $('#cms-revision-toolbar').height(); + if ( $me.hasClass('opened') ) { + var $height = $('#cms-revision-toolbar').height(); - $('#cms-revision-toolbar-layer').animate({top: (-1) * $height}, 'fast'); - $('#cms-editing-notice, #cms-revision-dropdown').hide(); - setCookie('toolbar_hidden', 1); - } - else { - $('#cms-revision-toolbar-layer').animate({top: 0}, 'fast'); - setCookie('toolbar_hidden', 0); - } + $('#cms-revision-toolbar-layer').animate({top: (-1) * $height}, 'fast'); + $('#cms-editing-notice, #cms-revision-dropdown').hide(); + setCookie('toolbar_hidden', 1); + } + else { + $('#cms-revision-toolbar-layer').animate({top: 0}, 'fast'); + setCookie('toolbar_hidden', 0); + } - $me.toggleClass('opened'); + $me.toggleClass('opened'); - return false; - } - ); + $e.preventDefault(); + }); - $('#cms-close-toolbar').click( - function () { + $('#cms-close-toolbar').click(function ($e) { - var $height = $('#cms-revision-toolbar').height(); + var $height = $('#cms-revision-toolbar').height(); - $('#cms-toggle-revision-toolbar').removeClass('opened'); - $('#cms-revision-toolbar-layer').css('top', (-1) * $height); + $('#cms-toggle-revision-toolbar').removeClass('opened'); + $('#cms-revision-toolbar-layer').css('top', (-1) * $height); - $('#cms-editing-notice, #cms-revision-dropdown').hide(); - setCookie('toolbar_hidden', 1); + $('#cms-editing-notice, #cms-revision-dropdown').hide(); + setCookie('toolbar_hidden', 1); - return false; - } - ); + $e.preventDefault(); + }); - $('#cms-close-editing-notice').click( - function () { + $('#cms-close-editing-notice').click(function ($e) { - $('#cms-editing-notice').hide(); + $('#cms-editing-notice').hide(); - return false; - } - ); + $e.preventDefault(); + }); - $('.toolbar-button', '#cms-revision-toolbar').click( - function ($e) { + $('.toolbar-button', '#cms-revision-toolbar').click(function ($e) { - var $button_name = $(this).attr('id').replace(/^(tool|div)_/, ''); + var $button_name = $(this).attr('id').replace(/^(tool|div)_/, ''); - $template_manager.revisionToolbarClick($button_name); + $template_manager.revisionToolbarClick($button_name); - } - ); + }); - setInterval( - function () { - $.getJSON( - $('#kf_revisions_' + $template_manager.pageId).attr('action') + '&events[page-revision]=OnGetInfo', - function ($data) { - $template_manager.pageInfo = $data; - $template_manager.processPageInfo(); - } - ); - }, 20 * 1000 // 20 seconds - ); + setInterval( + function () { + $.getJSON( + $('#kf_revisions_' + $template_manager.pageId).attr('action') + '&events[page-revision]=OnGetInfo', + function ($data) { + $template_manager.pageInfo = $data; + $template_manager.processPageInfo(); + } + ); + }, 20 * 1000 // 20 seconds + ); - if ( !$.isEmptyObject($template_manager.pageInfo) ) { - $template_manager.processPageInfo(); - } - } + if ( !$.isEmptyObject($template_manager.pageInfo) ) { + $template_manager.processPageInfo(); + } +} - ); -} TemplateManager.prototype.processPageInfo = function () { var $class_mapping = { @@ -322,7 +322,8 @@ $me.dblclick( function ($e) { $('div.cms-edit-btn:first', this).click(); - return false; + + $e.preventDefault(); } ); @@ -368,7 +369,7 @@ window.location.href = $translate_url; } - return false; + $e.preventDefault(); } TemplateManager.prototype.renumberMovableElements = function () { \ No newline at end of file