X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/bfdfacaea46413e3e32e4bdb3760fbe6f1ade25b..514e98aeae05045d0086aae39960124a572e646f:/platforma/static/js/main.js?ds=inline
diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js
index c7e0af86..3c1a3c00 100644
--- a/platforma/static/js/main.js
+++ b/platforma/static/js/main.js
@@ -473,12 +473,20 @@ function html(element) {
// for now allow only 1 range
if(n > 1) {
- window.alert("Zaznacz jeden obszar");
+ window.alert("Zaznacz jeden obszar.");
return false;
}
+
// remember the selected range
var range = selection.getRangeAt(0);
+
+
+ if( $(range.startContainer).is('.html-editarea')
+ || $(range.endContainer).is('.html-editarea') ) {
+ window.alert("Motywy można oznaczaÄ tylko na tekÅcie nie otwartym do edycji. \n Zamknij edytowany fragment i spróbuj ponownie.");
+ return false;
+ }
// verify if the start/end points make even sense -
// they must be inside a x-node (otherwise they will be discarded)
@@ -515,7 +523,7 @@ function html(element) {
etag.replaceWith(text);
xml2html({
xml: '',
- success: function(text) {
+ success: function(text) {
mtag = $('');
spoint.insertNode(mtag[0]);
mtag.replaceWith(text);
@@ -599,8 +607,14 @@ function html(element) {
function save(argument) {
var nodeName = $box.attr('x-node') || 'pe';
+ var insertedText = $('textarea', $overlay).val();
+
+ if ($origin.is('.motyw')) {
+ insertedText = insertedText.replace(/,\s*$/, '');
+ }
+
xml2html({
- xml: '<' + nodeName + '>' + $('textarea', $overlay).val() + '' + nodeName + '>',
+ xml: '<' + nodeName + '>' + insertedText + '' + nodeName + '>',
success: function(element) {
$box.html($(element).html());
$overlay.remove();
@@ -676,6 +690,7 @@ $(function() {
},
iframeClass: 'xml-iframe',
textWrapping: true,
+ lineNumbers: true,
tabMode: 'spaces',
indentUnit: 0,
initCallback: function(editor) {
@@ -760,7 +775,7 @@ $(function() {
event.preventDefault();
var params = eval("(" + $(this).attr('ui:action-params') + ")");
scriptletCenter.scriptlets[$(this).attr('ui:action')](editor, params);
- });
+ });
$('.toolbar select').change(function() {
var slug = $(this).val();