From 60ae83c14291cee551471c4fd0f049061e1472f0 Mon Sep 17 00:00:00 2001 From: joyqi Date: Tue, 26 Nov 2013 16:49:04 +0800 Subject: [PATCH 1/2] fixed #85 --- admin/file-upload-js.php | 2 +- admin/media.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/file-upload-js.php b/admin/file-upload-js.php index d7a363f2..9b3b2e7f 100644 --- a/admin/file-upload-js.php +++ b/admin/file-upload-js.php @@ -173,7 +173,7 @@ $(document).ready(function() { $(this).removeClass('drag'); }, - uploadOpened : function (i, file, len) { + uploadStarted : function (i, file, len) { fileUploadStart(file.name, 'drag-' + i); }, diff --git a/admin/media.php b/admin/media.php index 5df9c585..7c9f1570 100644 --- a/admin/media.php +++ b/admin/media.php @@ -176,7 +176,7 @@ $(document).ready(function() { $(this).removeClass('drag'); }, - uploadOpened : function (i, file, len) { + uploadStarted : function (i, file, len) { fileUploadStart(file.name, 'drag-' + i); }, From cdad2e9ec04a03ef49203ee851011dcc64d285f0 Mon Sep 17 00:00:00 2001 From: joyqi Date: Tue, 26 Nov 2013 17:15:48 +0800 Subject: [PATCH 2/2] fix preview height --- admin/editor-js.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/editor-js.php b/admin/editor-js.php index 15739293..dd2dd8a1 100644 --- a/admin/editor-js.php +++ b/admin/editor-js.php @@ -152,10 +152,11 @@ $(document).ready(function () { } }); - var input = $('#text'), th = textarea.height(); + var input = $('#text'), th = textarea.height(), ph = preview.height(); editor.hooks.chain('enterFakeFullScreen', function () { th = textarea.height(); + ph = preview.height(); $(document.body).addClass('fullscreen'); var h = $(window).height() - toolbar.outerHeight(); @@ -174,7 +175,7 @@ $(document).ready(function () { editor.hooks.chain('exitFullScreen', function () { $(document.body).removeClass('fullscreen'); textarea.height(th); - preview.css('height', 'auto'); + preview.height(ph); }); editor.run();