diff --git a/engine/lib/external/jquery/markitup/jquery.markitup.js b/engine/lib/external/jquery/markitup/jquery.markitup.js
index 18b73914..ab99b742 100644
--- a/engine/lib/external/jquery/markitup/jquery.markitup.js
+++ b/engine/lib/external/jquery/markitup/jquery.markitup.js
@@ -1,6 +1,6 @@
// ----------------------------------------------------------------------------
// markItUp! Universal MarkUp Engine, JQuery plugin
-// v 1.1.11
+// v 1.1.12
// Dual licensed under the MIT and GPL licenses.
// ----------------------------------------------------------------------------
// Copyright (C) 2007-2011 Jay Salvat
@@ -250,13 +250,12 @@
string = string || selection;
var lines = selection.split(/\r?\n/), blocks = [];
+
for (var l=0; l < lines.length; l++) {
line = lines[l];
- if ($.trim(line) == '') {
- continue;
- }
- if (line.match(/ +$/)) {
- blocks.push(openWith + line.replace(/ $/, '') + closeWith + ' ');
+ var trailingSpaces;
+ if (trailingSpaces = line.match(/ *$/)) {
+ blocks.push(openWith + line.replace(/ *$/g, '') + closeWith + trailingSpaces);
} else {
blocks.push(openWith + line + closeWith);
}
diff --git a/templates/skin/developer-jquery/js/markup_settings.js b/templates/skin/developer-jquery/js/markup_settings.js
index 96ab8f38..83f296df 100644
--- a/templates/skin/developer-jquery/js/markup_settings.js
+++ b/templates/skin/developer-jquery/js/markup_settings.js
@@ -36,7 +36,7 @@ function getMarkitupSettings() {
{name: ls.lang.get('panel_url'), className:'editor-link', key:'L', openWith:'', closeWith:'', placeHolder:'Your text to link...' },
{separator:'---------------' },
{name: ls.lang.get('panel_clear_tags'), className:'editor-clean', replaceWith: function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") } },
- {name: ls.lang.get('panel_cut'), className:'editor-cut', openWith:''}
+ {name: ls.lang.get('panel_cut'), className:'editor-cut', replaceWith: function(markitup) { if (markitup.selection) return ''; else return '' }}
]
}
}
diff --git a/templates/skin/new-jquery/css/grid.css b/templates/skin/new-jquery/css/grid.css
index 4d83b167..67d844a1 100644
--- a/templates/skin/new-jquery/css/grid.css
+++ b/templates/skin/new-jquery/css/grid.css
@@ -49,6 +49,7 @@
/* Menu */
#nav .menu { padding-bottom: 30px; float: left; font-size: 15px; margin: 11px 0 0 0; }
#nav .menu li { float: left; color: #51B038; padding: 3px 10px 4px 10px; margin-right: 5px; position: relative; }
+#nav .menu li a.new { color: #390; }
#nav .menu li a { text-decoration: none; color: #838383; }
#nav .menu li a:hover { color: #333; }
#nav .menu li.active { position: relative; background: #fff; border-bottom: 1px solid #ddd; }
diff --git a/templates/skin/new-jquery/js/markup_settings.js b/templates/skin/new-jquery/js/markup_settings.js
index a35831a8..4bd67beb 100644
--- a/templates/skin/new-jquery/js/markup_settings.js
+++ b/templates/skin/new-jquery/js/markup_settings.js
@@ -35,8 +35,8 @@ function getMarkitupSettings() {
{name: ls.lang.get('panel_video'), className:'editor-video', replaceWith:'' },
{name: ls.lang.get('panel_url'), className:'editor-link', key:'L', openWith:'', closeWith:'', placeHolder:'Your text to link...' },
{separator:'---------------' },
- {name: ls.lang.get('panel_clear_tags'), className:'editor-clean', replaceWith: function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") } },
- {name: ls.lang.get('panel_cut'), className:'editor-cut', openWith:''}
+ {name: ls.lang.get('panel_clear_tags'), className:'editor-clean', replaceWith: function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") } },
+ {name: ls.lang.get('panel_cut'), className:'editor-cut', replaceWith: function(markitup) { if (markitup.selection) return ''; else return '' }}
]
}
}
diff --git a/templates/skin/new-jquery/menu.blog.tpl b/templates/skin/new-jquery/menu.blog.tpl
index 8fa5d720..f60684d2 100644
--- a/templates/skin/new-jquery/menu.blog.tpl
+++ b/templates/skin/new-jquery/menu.blog.tpl
@@ -1,6 +1,6 @@