mirror_php/typecho
1
0
Fork 0
mirror of https://github.com/typecho/typecho.git synced 2025-04-04 02:02:27 +02:00
Code Issues Projects Releases Wiki Activity

fixed #45

Browse Source
This commit is contained in:
joyqi 2013-11-01 12:50:40 +08:00
parent 1cd85e5010
commit a80a67a520
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/editor-js.php
View File

@ -42,7 +42,7 @@ $(document).ready(function () {
redomac: '<?php _e('重做'); ?> - Ctrl+Shift+Z',
fullscreen: '<?php _e('全屏'); ?> - Ctrl+M',
exitFullscreen: '<?php _e('退出全屏'); ?> - Ctrl+M',
exitFullscreen: '<?php _e('退出全屏'); ?> - Ctrl+E',
fullscreenUnsupport: '<?php _e('此浏览器不支持全屏操作'); ?>',
imagedialog: '<p><b><?php _e('插入图片'); ?></b></p><p><?php _e('请在下方的输入框内输入要插入的远程图片地址'); ?></p><p><?php _e('您也可以使用编辑器下方的文件上传功能插入本地图片'); ?></p>',
@ -127,8 +127,13 @@ $(document).ready(function () {
var input = $('#text'), th = textarea.height();
editor.hooks.chain('enterFullScreen', function () {
editor.hooks.chain('enterFakeFullScreen', function () {
th = textarea.height();
$(document.body).addClass('fullscreen');
textarea.css('height', document.body.clientHeight - 46 - 1);
});
editor.hooks.chain('enterFullScreen', function () {
$(document.body).addClass('fullscreen');
textarea.css('height', window.screen.height - 46);
});

35
admin/js/markdown.js
View File

@ -3068,7 +3068,7 @@ else
headingexample: "Heading",
fullscreen: 'FullScreen Ctrl+M',
exitFullscreen: 'Exit FullScreen Ctrl+M',
exitFullscreen: 'Exit FullScreen Ctrl+E',
fullscreenUnsupport: 'Sorry, the browser dont support fullscreen api',
hr: "Horizontal Rule <hr> Ctrl+R",
@ -3153,6 +3153,7 @@ else
* image url (or null if the user cancelled). If this hook returns false, the default dialog will be used.
*/
hooks.addNoop("enterFullScreen");
hooks.addNoop("enterFakeFullScreen");
hooks.addNoop("exitFullScreen");
this.getConverter = function () { return markdownConverter; }
@ -4318,6 +4319,9 @@ else
case 'm':
doClick(buttons.fullscreen);
break;
case 'e':
doClick(buttons.exitFullscreen);
break;
case "h":
doClick(buttons.heading);
break;
@ -4565,10 +4569,10 @@ else
buttons.redo = makeButton("wmd-redo-button", redoTitle, "-220px", null);
buttons.redo.execute = function (manager) { if (manager) manager.redo(); };
buttons.fullscreen = makeButton("wmd-fullscreen-button", getString("fullscreen"), "-240px", null);
buttons.fullscreen.execute = function () { fullScreenManager.doFullScreen(buttons); };
buttons.fullscreen.execute = function () { fullScreenManager.doFullScreen(buttons, true); };
buttons.exitFullscreen = makeButton("wmd-exit-fullscreen-button", getString("exitFullscreen"), "-260px", null);
buttons.exitFullscreen.style.display = 'none';
buttons.exitFullscreen.execute = function () { fullScreenManager.doFullScreen(buttons); };
buttons.exitFullscreen.execute = function () { fullScreenManager.doFullScreen(buttons, false); };
if (helpOptions) {
var helpButton = document.createElement("li");
@ -5295,6 +5299,7 @@ else
this.fullScreenBind = false;
this.hooks = hooks;
this.getString = getString;
this.isFakeFullScreen = false;
}
function getFullScreenAdapter () {
@ -5332,8 +5337,8 @@ else
document.msIsFullScreen;
};
// fullscreen
FullScreenManager.prototype.doFullScreen = function (buttons) {
// fullscreen
FullScreenManager.prototype.doFullScreen = function (buttons, enter) {
var adapter = getFullScreenAdapter(), self = this;
if (!adapter) {
@ -5357,11 +5362,25 @@ else
this.fullScreenBind = true;
}
if (!isFullScreen()) {
document.body[adapter.requestFullscreen]('webkitRequestFullScreen' == adapter.requestFullscreen
if (enter) {
if (self.isFakeFullScreen) {
document.body[adapter.requestFullscreen]('webkitRequestFullScreen' == adapter.requestFullscreen
? Element.ALLOW_KEYBOARD_INPUT : null);
self.isFakeFullScreen = false;
} else {
buttons.exitFullscreen.style.display = '';
self.hooks.enterFakeFullScreen();
self.isFakeFullScreen = true;
}
} else {
document[adapter.cancelFullscreen]();
if (self.isFakeFullScreen) {
buttons.exitFullscreen.style.display = 'none';
self.hooks.exitFullScreen();
} else {
document[adapter.cancelFullscreen]();
}
self.isFakeFullScreen = false;
}
};
})();