@@ -313,18 +313,16 @@ var ProcessWireAdminTheme = {
*/
setupButtonStates: function() {
// jQuery UI button states
$(".ui-button").hover(function() {
$(document).on('mouseover', '.ui-button', function() {
$(this).removeClass("ui-state-default").addClass("ui-state-hover");
}, function() {
}).on('mouseout', '.ui-button', function() {
$(this).removeClass("ui-state-hover").addClass("ui-state-default");
}).click(function() {
$(this).removeClass("ui-state-default").addClass("ui-state-active");
}).on('click', '.ui-button', function() {
$(this).removeClass("ui-state-default").addClass("ui-state-active"); // .effect('highlight', {}, 100);
}).on('click', 'a > button', function() {
// make buttons with <a> tags click to the href of the <a>
window.location = $(this).parent("a").attr('href');
});

// make buttons with <a> tags click to the href of the <a>
$("a > button").click(function() {
window.location = $(this).parent("a").attr('href');
});
},

/**

Large diffs are not rendered by default.

@@ -58,14 +58,23 @@ function ckeInitEvents(editor) {
*
*/
function ckeSaveReadyInline($inputfield) {
if(!$inputfield.length) return;
var $inlines = $inputfield.hasClass('.InputfieldCKEditorInline') ? $inputfield : $inputfield.find(".InputfieldCKEditorInline");
$inlines.each(function() {
if($inlines.length) $inlines.each(function() {
var $t = $(this);
var value;
if($t.hasClass('InputfieldCKEditorLoaded')) {
var editor = CKEDITOR.instances[$t.attr('id')];
// getData() ensures there are no CKE specific remnants in the markup
value = editor.getData();
if(typeof editor != "undefined") {
if(editor.focusManager.hasFocus) {
// TMP: CKEditor 4.5.1 / 4.5.2 has documented bug that causes JS error on editor.getData() here
// this section of code can be removed after they fix it (presumably in 4.5.3)
editor.focusManager.focus(true);
editor.focus();
}
value = editor.getData();
}
} else {
value = $t.html();
}
@@ -35,7 +35,7 @@ class InputfieldCKEditor extends InputfieldTextarea {
public static function getModuleInfo() {
return array(
'title' => 'CKEditor',
'version' => 151, // 146
'version' => 152, // 146
'summary' => __('CKEditor textarea rich text editor.', __FILE__),
'installs' => array('MarkupHTMLPurifier'),
);
@@ -86,7 +86,7 @@ class InputfieldCKEditor extends InputfieldTextarea {
* Version number for CKEditor directory
*
*/
const CKEDITOR_VERSION = '4.5.1';
const CKEDITOR_VERSION = '4.5.2';

/**
* Instance of MarkupHTMLPurifier module

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.