X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/6452ce53707b8e5c3f9ef95dd3793284272398e4..9f979033640e55e9eaf62d1f1ae8dca634bdd6e2:/redakcja/static/js/button_scripts.js?ds=sidebyside
diff --git a/redakcja/static/js/button_scripts.js b/redakcja/static/js/button_scripts.js
index e7b1c42a..c3275938 100644
--- a/redakcja/static/js/button_scripts.js
+++ b/redakcja/static/js/button_scripts.js
@@ -48,9 +48,8 @@ function ScriptletCenter()
{
this.scriptlets = {};
- this.scriptlets['insert_tag'] = function(context, params, done)
+ this.scriptlets['insert_tag'] = function(context, params, text, move_forward, done)
{
- var text = this.XMLEditorSelectedText(context);
var start_tag = '<'+params.tag;
var move_cursor = false;
@@ -95,18 +94,14 @@ function ScriptletCenter()
}
}
- this.XMLEditorReplaceSelectedText(context, output);
-
- try {
- if (move_cursor) {
- this.XMLEditorMoveCursorForward(context, params.tag.length+2);
- }
- } catch(e) {}
+ if (move_cursor) {
+ move_forward -= params.tag.length+3;
+ }
- done();
+ done(output, move_forward);
}.bind(this);
- this.scriptlets['lineregexp'] = function(context, params, done) {
+ this.scriptlets['lineregexp'] = function(context, params, text, move_forward, done) {
var self = this;
var exprs = $.map(params.exprs, function(expr) {
@@ -119,9 +114,7 @@ function ScriptletCenter()
};
});
- var partial = true;
- var text = this.XMLEditorSelectedText(context);
- if(!text) return done();
+ if(!text) done(text, move_forward);
var changed = 0;
var lines = text.split('\n');
@@ -138,15 +131,15 @@ function ScriptletCenter()
if(old_line != line) changed += 1;
return line;
}, function(newlines) {
- if(changed > 0) {
- self.XMLEditorReplaceSelectedText(context, newlines.join('\n') );
- };
+ if(changed > 0) {
+ text = newlines.join('\n');
+ };
- done();
+ done(text, move_forward);
});
}.bind(this);
- this.scriptlets['fulltextregexp'] = function(context, params, done) {
+ this.scriptlets['fulltextregexp'] = function(context, params, text, move_forward, done) {
var self = this;
var exprs = $.map(params.exprs, function(expr) {
@@ -160,72 +153,42 @@ function ScriptletCenter()
};
});
- var text = this.XMLEditorSelectedText(context);
- if(!text) return done();
- var original = text;$
+ if(!text) done(text, move_forward);
nblck_each(exprs, function(expr, index) {
$progress.html(600 + index);
text = text.replace(expr.rx, expr.repl);
}, function() {
- if( original != text) {
- self.XMLEditorReplaceSelectedText(context, text);
- }
-
- done();
+ done(text, move_forward);
});
}.bind(this);
- this.scriptlets['macro'] = function(context, params, done) {
+ this.scriptlets['macro'] = function(context, params, text, move_forward, done) {
var self = this;
var i = 0;
- function next() {
+ function next(text, move_forward) {
if (i < params.length) {
var e = params[i];
i = i + 1;
- self.scriptlets[e[0]](context, e[1], next);
+ self.scriptlets[e[0]](context, e[1], text, move_forward, next);
}
else {
- done();
+ done(text, move_forward);
}
};
- next();
+ next(text, move_forward);
}.bind(this);
- this.scriptlets['lowercase'] = function(context, params, done)
+ this.scriptlets['lowercase'] = function(context, params, text, move_forward, done)
{
- var text = this.XMLEditorSelectedText(context);
-
- if(!text) return;
-
- var repl = '';
- var lcase = text.toLowerCase();
- var ucase = text.toUpperCase();
-
- if(lcase == text) repl = ucase; /* was lowercase */
- else if(ucase != text) repl = lcase; /* neither lower- or upper-case */
- else { /* upper case -> camel-case */
- var words = $(lcase.split(/\s/)).map(function() {
- if(this.length > 0) {
- return this[0].toUpperCase() + this.slice(1);
- } else {
- return '';
- }
- });
- repl = words.join(' ');
- }
-
- if(repl != text) this.XMLEditorReplaceSelectedText(context, repl);
-
- done();
+ if(!text) done(text, move_forward);
+ done(text.toLowerCase(), move_forward);
}.bind(this);
- this.scriptlets["insert_stanza"] = function(context, params, done) {
- var text = this.XMLEditorSelectedText(context);
-
+ this.scriptlets["insert_stanza"] = function(context, params, text, move_forward, done) {
if(text) {
var verses = text.split('\n');
text = ''; var buf = ''; var ebuf = '';
@@ -243,14 +206,52 @@ function ScriptletCenter()
}
}
text = text + buf + '\n' + ebuf;
- this.XMLEditorReplaceSelectedText(context, text);
+ }
+ else {
+ text = ""
+ move_forward -= "".length;
}
- if (!text) {
- this.XMLEditorMoveCursorForward(context, params.tag.length + 2);
+ done(text, move_forward);
+ }.bind(this);
+
+
+ this.scriptlets['autotag'] = function(context, params, text, move_forward, done)
+ {
+ if(!text.match(/^\n+$/)) done(text, move_forward);
+
+ function insert_done(output, mf) {
+ text += output;
+ }
+
+ if (!params.split) params.split = 2;
+ if (!params.padding) params.padding = 3;
+
+ chunks = text.replace(/^\n+|\n+$/, '').split(new RegExp("\\n{"+params.split+",}"));
+ text = text.match(/^\n+/);
+ if (!text)
+ text = '';
+ padding = '';
+ for(; params.padding; params.padding--) {
+ padding += "\n";
}
- done();
+ if (params.tag == 'strofa')
+ tagger = this.scriptlets['insert_stanza'];
+ else
+ tagger = this.scriptlets['insert_tag'];
+
+ for (i in chunks) {
+ if (chunks[i]) {
+ if (params.tag == 'akap' && chunks[i].match(/^---/))
+ tag = 'akap_dialog';
+ else tag = params.tag;
+ tagger(context, {tag: tag}, chunks[i], 0, insert_done);
+ text += padding;
+ }
+ }
+
+ done(text, move_forward);
}.bind(this);
}
@@ -258,19 +259,29 @@ function ScriptletCenter()
ScriptletCenter.prototype.callInteractive = function(opts) {
$progress = $('Executing script');
var self = this;
-
+
/* This won't work, 'cause the JS below might be synchronous :( */
/* var timer = setTimeout(function() {
$.blockUI({message: $progress});
timer = null;
}, 1000); */
-
+
$.blockUI({message: $progress, showOverlay: false});
- self.scriptlets[opts.action](opts.context, opts.extra, function(){
- /*if(timer)
- clearTimeout(timer);
+ var input = self.XMLEditorSelectedText(opts.context);
+ self.scriptlets[opts.action](opts.context, opts.extra, input, 0, function(output, move_forward){
+ /*if(timer)
+ clearTimeout(timer);
else */
+ if (input != output) {
+ self.XMLEditorReplaceSelectedText(opts.context, output)
+ }
+ if (move_forward) {
+ try {
+ self.XMLEditorMoveCursorForward(opts.context, move_forward)
+ }
+ catch(e) {}
+ }
$.unblockUI(); // done
});
}
@@ -282,7 +293,7 @@ ScriptletCenter.prototype.XMLEditorSelectedText = function(editor) {
ScriptletCenter.prototype.XMLEditorReplaceSelectedText = function(editor, replacement)
{
- $progress.html("Replacing text");
+ $progress.html("Replacing text");
editor.replaceSelection(replacement);
};