mirror_php/typecho
1
0
Fork 0
mirror of https://github.com/typecho/typecho.git synced 2025-03-23 19:40:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/typecho/typecho-replica

Browse Source
This commit is contained in:
fen 2013-11-04 12:31:49 +08:00
commit dfa2e739bb
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/editor-js.php
View File

@ -131,17 +131,24 @@ $(document).ready(function () {
editor.hooks.chain('enterFakeFullScreen', function () {
th = textarea.height();
$(document.body).addClass('fullscreen');
textarea.css('height', $(window).height() - toolbar.outerHeight());
var h = $(window).height() - toolbar.outerHeight();
textarea.css('height', h);
preview.css('height', h);
});
editor.hooks.chain('enterFullScreen', function () {
$(document.body).addClass('fullscreen');
textarea.css('height', window.screen.height - toolbar.outerHeight());
var h = window.screen.height - toolbar.outerHeight();
textarea.css('height', h);
preview.css('height', h);
});
editor.hooks.chain('exitFullScreen', function () {
$(document.body).removeClass('fullscreen');
textarea.height(th);
preview.css('height', 'auto');
});
editor.run();

10
admin/js/markdown.js
View File

@ -216,7 +216,7 @@ this.makeHtml = function(text) {
text = _ExecuteExtension(x, text);
});
text = text.replace(/<\/?(\!doctype|html|head|body|link|title|input|select|button|textarea|style|script|noscript|iframe|object|embed)[^>]*>/ig, function (all) {
text = text.replace(/<\/?(\!doctype|html|head|body|link|title|input|select|button|textarea|style|noscript)[^>]*>/ig, function (all) {
return all.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
@ -225,7 +225,7 @@ this.makeHtml = function(text) {
return all;
});
if (text.indexOf('<!--more-->')) {
if (text.indexOf('<!--more-->') > 0) {
var parts = text.split(/\s*<\!\-\-more\-\->\s*/),
summary = parts.shift(),
details = parts.join('');
@ -4858,10 +4858,10 @@ else
if (!chunk.selection) {
if (isImage) {
chunk.selection = that.getString("imagename") || that.getString("imagedescription");
chunk.selection = that.getString("imagename").replace('_', '\\_') || that.getString("imagedescription");
}
else {
chunk.selection = that.getString("linkname") || that.getString("linkdescription");
chunk.selection = that.getString("linkname").replace('_', '\\_') || that.getString("linkdescription");
}
}
}
@ -5307,7 +5307,7 @@ else
commandProto.doMore = function (chunk, postProcessing) {
chunk.startTag = "<!--more-->\n\n";
chunk.selection = "";
chunk.skipLines(2, 1, true);
chunk.skipLines(2, 0, true);
}
commandProto.doTab = function (chunk, postProcessing) {

3
admin/js/typecho.js
View File

@ -232,8 +232,9 @@
return true;
}
file = file.toLowerCase();
for (var i = 0; i < s.types.length; i ++) {
var ext = s.types[i];
var ext = s.types[i].toLowerCase();
if (file.length <= ext.length) {
continue;

2
var/Widget/Contents/Post/Edit.php
View File

@ -187,6 +187,7 @@ class Widget_Contents_Post_Edit extends Widget_Abstract_Contents implements Widg
$contents['status'] = 'publish';
} else {
$contents['status'] = $contents['visibility'];
$contents['password'] = '';
}
} else {
$contents['status'] = 'waiting';
@ -259,6 +260,7 @@ class Widget_Contents_Post_Edit extends Widget_Abstract_Contents implements Widg
$contents['status'] = 'publish';
} else {
$contents['status'] = $contents['visibility'];
$contents['password'] = '';
}
} else {
$contents['status'] = 'waiting';