fix

[redakcja.git] / redakcja / static / js / button_scripts.js

diff --git a/redakcja/static/js/button_scripts.js b/redakcja/static/js/button_scripts.js
index e7b1c42..fb53dd2 100644 (file)
--- a/redakcja/static/js/button_scripts.js
+++ b/redakcja/static/js/button_scripts.js
@@ -48,11 +48,14 @@ function ScriptletCenter()
 {
     this.scriptlets = {};
 
 {
     this.scriptlets = {};
 

-    this.scriptlets['insert_tag'] = function(context, params, done)
+    this.scriptlets['insert_tag'] = function(context, params, text, move_forward, move_up, done)

     {
     {

-        var text = this.XMLEditorSelectedText(context);
+        var padding_top = '';
+        for (var i=params.padding_top; i; i--)
+            padding_top += '\n';
+

         var start_tag = '<'+params.tag;
         var start_tag = '<'+params.tag;

-        var move_cursor = false;
+        var cursor_inside = false;

 
         for (var attr in params.attrs) {
             start_tag += ' '+attr+'="' + params.attrs[attr] + '"';
 
         for (var attr in params.attrs) {
             start_tag += ' '+attr+'="' + params.attrs[attr] + '"';


@@ -61,6 +64,10 @@ function ScriptletCenter()
         start_tag += '>';
         var end_tag = '</'+params.tag+'>';
 
         start_tag += '>';
         var end_tag = '</'+params.tag+'>';
 

+        var padding_bottom = '';
+        for (var i=params.padding_bottom; i; i--)
+            padding_bottom += '\n';
+

         if(text.length > 0) {
             // tokenize
             var output = '';
         if(text.length > 0) {
             // tokenize
             var output = '';


@@ -72,41 +79,41 @@ function ScriptletCenter()
                 }
                 else { // character
                     output += token;
                 }
                 else { // character
                     output += token;

-                    if(output == token) output += start_tag;
+                    if(output == token) output += padding_top + start_tag;

                     token = '';
                     output += text[index];
                 }
             }
 
             if( output[output.length-1] == '\\' ) {
                     token = '';
                     output += text[index];
                 }
             }
 
             if( output[output.length-1] == '\\' ) {

-                output = output.substr(0, output.length-1) + end_tag + '\\';
+                output = output.substr(0, output.length-1) + end_tag + padding_bottom + '\\';

             } else {
             } else {

-                output += end_tag;
+                output += end_tag + padding_bottom;

             }
             output += token;
             }
             output += token;

+
+            // keep cursor inside tag if some previous scriptlet has already moved it
+            cursor_inside = move_forward != 0 || move_up != 0;

         }
         else {
             if(params.nocontent) {
         }
         else {
             if(params.nocontent) {

-                output = "<"+params.tag +" />";
+                output = padding_top + "<"+params.tag +" />" + padding_bottom;

             }
             else {
             }
             else {

-                output = start_tag + end_tag;
-                move_cursor = true;
+                output = padding_top + start_tag + end_tag + padding_bottom;
+                cursor_inside = true;

             }
         }
 
             }
         }
 

-        this.XMLEditorReplaceSelectedText(context, output);
-
-        try {
-            if (move_cursor) {
-                this.XMLEditorMoveCursorForward(context, params.tag.length+2);
-            }
-        } catch(e) {}
+        if (cursor_inside) {
+            move_forward -= params.tag.length + 3;
+            move_up += params.padding_bottom || 0;
+        }

 
 

-               done();
+        done(output, move_forward, move_up);

     }.bind(this);
 
     }.bind(this);
 

-    this.scriptlets['lineregexp'] = function(context, params, done) {
+    this.scriptlets['lineregexp'] = function(context, params, text, move_forward, move_up, done) {

                var self = this;
 
         var exprs = $.map(params.exprs, function(expr) {
                var self = this;
 
         var exprs = $.map(params.exprs, function(expr) {


@@ -119,9 +126,7 @@ function ScriptletCenter()
                 };
         });
 
                 };
         });
 

-        var partial = true;
-        var text = this.XMLEditorSelectedText(context);
-        if(!text) return done();
+        if(!text) done(text, move_forward, move_up);

 
         var changed = 0;
         var lines = text.split('\n');
 
         var changed = 0;
         var lines = text.split('\n');


@@ -138,15 +143,15 @@ function ScriptletCenter()
             if(old_line != line) changed += 1;
             return line;
         }, function(newlines) {
             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, move_up);

                });
     }.bind(this);
 
                });
     }.bind(this);
 

-    this.scriptlets['fulltextregexp'] = function(context, params, done) {
+    this.scriptlets['fulltextregexp'] = function(context, params, text, move_forward, move_up, done) {

                var self = this;
 
         var exprs = $.map(params.exprs, function(expr) {
                var self = this;
 
         var exprs = $.map(params.exprs, function(expr) {


@@ -160,71 +165,49 @@ function ScriptletCenter()
                 };
         });
 
                 };
         });
 

-        var text = this.XMLEditorSelectedText(context);
-        if(!text) return done();
-        var original = text;$
+        if(!text) done(text, move_forward, move_up);

 
                nblck_each(exprs, function(expr, index) {
                        $progress.html(600 + index);
             text = text.replace(expr.rx, expr.repl);
         }, function() {
 
                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, move_up);

                });
     }.bind(this);
 
                });
     }.bind(this);
 

-    this.scriptlets['macro'] = function(context, params, done) {
+    this.scriptlets['macro'] = function(context, params, text, move_forward, move_up, done) {

         var self = this;
                var i = 0;
 
         var self = this;
                var i = 0;
 

-               function next() {
+               function next(text, move_forward, move_up) {

                if (i < params.length) {
                                var e = params[i];
                                i = i + 1;
                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, move_up, next);

                        }
                        else {
                        }
                        else {

-                               done();
+                               done(text, move_forward, move_up);

                        }
         };
 
                        }
         };
 

-               next();
+               next(text, move_forward, move_up);

     }.bind(this);
 
     }.bind(this);
 

-    this.scriptlets['lowercase'] = function(context, params, done)
+    this.scriptlets['lowercase'] = function(context, params, text, move_forward, move_up, 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, move_up);
+        done(text.toLowerCase(), move_forward, move_up);

     }.bind(this);
 
 
     }.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, move_up, done) {
+        var padding_top = '';
+        for (var i=params.padding_top; i; i--)
+            padding_top += '\n';
+
+        var padding_bottom = '';
+        for (var i=params.padding_bottom; i; i--)
+            padding_bottom += '\n';

 
         if(text) {
             var verses = text.split('\n');
 
         if(text) {
             var verses = text.split('\n');


@@ -242,15 +225,54 @@ function ScriptletCenter()
                     ebuf += '\n' + verses[i];
                 }
             }
                     ebuf += '\n' + verses[i];
                 }
             }

-            text = text + buf + '\n</strofa>' + ebuf;
-            this.XMLEditorReplaceSelectedText(context, text);
+            text = padding_top + text + buf + '\n</strofa>' + padding_bottom + ebuf;
+        }
+        else {
+            text = padding_top + "<strofa></strofa>" + padding_bottom;
+            move_forward -= "</strofa>".length;
+            move_up += params.padding_bottom || 0;

         }
 
         }
 

-        if (!text) {
-            this.XMLEditorMoveCursorForward(context, params.tag.length + 2);
+        done(text, move_forward, move_up);
+    }.bind(this);
+
+
+    this.scriptlets['autotag'] = function(context, params, text, move_forward, move_up, done)
+    {
+        if(!text.match(/^\n+$/)) done(text, move_forward, move_up);
+
+        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";
+        }
+
+        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();
+        done(text, move_forward, move_up);

     }.bind(this);
 
 }
     }.bind(this);
 
 }


@@ -258,19 +280,29 @@ function ScriptletCenter()
 ScriptletCenter.prototype.callInteractive = function(opts) {
        $progress = $('<span>Executing script</span>');
        var self = this;
 ScriptletCenter.prototype.callInteractive = function(opts) {
        $progress = $('<span>Executing script</span>');
        var self = this;

-       
+

        /* This won't work, 'cause the JS below might be synchronous :( */
        /* var timer = setTimeout(function() {
            $.blockUI({message: $progress});
            timer = null;
        }, 1000); */
        /* 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});
 
        $.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, 0, function(output, move_forward, move_up){
+           /*if(timer)
+               clearTimeout(timer);

            else */
            else */

+        if (input != output) {
+            self.XMLEditorReplaceSelectedText(opts.context, output)
+        }
+        if (move_forward || move_up) {
+            try {
+                self.XMLEditorMoveCursorForward(opts.context, move_forward, move_up)
+            }
+            catch(e) {}
+        }

            $.unblockUI(); // done
        });
 }
            $.unblockUI(); // done
        });
 }


@@ -282,13 +314,28 @@ ScriptletCenter.prototype.XMLEditorSelectedText = function(editor) {
 
 ScriptletCenter.prototype.XMLEditorReplaceSelectedText = function(editor, replacement)
 {
 
 ScriptletCenter.prototype.XMLEditorReplaceSelectedText = function(editor, replacement)
 {

-       $progress.html("Replacing text");       
+       $progress.html("Replacing text");

        editor.replaceSelection(replacement);
 };
 
        editor.replaceSelection(replacement);
 };
 

-ScriptletCenter.prototype.XMLEditorMoveCursorForward = function(panel, n) {
+ScriptletCenter.prototype.XMLEditorMoveCursorForward = function(panel, right, up) {

     var pos = panel.cursorPosition();
     var pos = panel.cursorPosition();

-    panel.selectLines(pos.line, pos.character + n);
+    if (up) {
+        line = pos.line;
+        while (up < 0) {
+            line = panel.nextLine(line);
+            ++up;
+        }
+        while (up > 0) {
+            line = panel.prevLine(line);
+            --up;
+        }
+        len = panel.lineContent(line).length;
+        panel.selectLines(line, len + right);
+    }
+    else {
+        panel.selectLines(pos.line, pos.character + right);
+    }

 };
 
 var scriptletCenter;
 };
 
 var scriptletCenter;