From: Darren <darren@Darrens-MacBook-Pro.local>
Date: Tue, 5 Mar 2013 15:52:17 +0000 (+0000)
Subject: Client user script editor
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=22373da674de567a3271832a24dc2e4f734ff109;p=KiwiIRC.git

Client user script editor
---

diff --git a/client/assets/dev/app.js b/client/assets/dev/app.js
index c6d2835..ee1ff68 100644
--- a/client/assets/dev/app.js
+++ b/client/assets/dev/app.js
@@ -52,7 +52,10 @@ _kiwi.global = {
 	        };
 
 	        _.each(funcs, function(gateway_fn, func_name) {
-	        	obj[func_name] = _kiwi.gateway[gateway_fn];
+	        	obj[func_name] = function() {
+	        		var fn_name = gateway_fn;
+	        		_kiwi.gateway[fn_name].apply(_kiwi.gateway, arguments);
+	        	};
 	        });
 
 	        return obj;
diff --git a/client/assets/dev/applet_scripteditor.js b/client/assets/dev/applet_scripteditor.js
new file mode 100644
index 0000000..8512129
--- /dev/null
+++ b/client/assets/dev/applet_scripteditor.js
@@ -0,0 +1,94 @@
+    (function () {
+        var view = Backbone.View.extend({
+            events: {
+                'click .btn_save': 'onSave'
+            },
+
+            initialize: function (options) {
+                var that = this;
+                this.$el = $($('#tmpl_script_editor').html());
+
+                this.model.on('applet_loaded', function () {
+                    that.$el.parent().css('height', '100%');
+                    $script('http://d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js', function (){ that.createAce(); });
+                });
+            },
+
+
+            createAce: function () {
+                var editor_id = 'editor_' + Math.floor(Math.random()*10000000).toString();
+                this.editor_id = editor_id;
+
+                this.$el.find('.editor').attr('id', editor_id);
+
+                this.editor = ace.edit(editor_id);
+                this.editor.setTheme("ace/theme/monokai");
+                this.editor.getSession().setMode("ace/mode/javascript");
+
+                var script_content = _kiwi.global.settings.get('user_script') || '';
+                this.editor.setValue(script_content);
+            },
+
+
+            onSave: function (event) {
+                var script_content, user_fn;
+
+                // Build the user script up with some pre-defined components
+                script_content = 'var network = kiwi.components.Network();\n';
+                script_content += 'var input = kiwi.components.ControlInput();\n';
+                script_content += this.editor.getValue() + '\n';
+
+                // Add a dispose method to the user script for cleaning up
+                script_content += 'this._dispose = function(){ network.off(); if(this.dispose) this.dispose(); }';
+
+                // Try to compile the user script
+                try {
+                    user_fn = new Function(script_content);
+
+                    // Dispose any existing user script
+                    if (_kiwi.user_script && _kiwi.user_script._dispose)
+                        _kiwi.user_script._dispose();
+
+                    // Create and run the new user script
+                    _kiwi.user_script = new user_fn();
+
+                } catch (err) {
+                    this.setStatus('Script error. ' + err.toString());
+                    return;
+                }
+
+                // If we're this far, no errors occured. Save the user script
+                _kiwi.global.settings.set('user_script', this.editor.getValue());
+                _kiwi.global.settings.save();
+
+                this.setStatus('Your script has been saved and is now active :)');
+            },
+
+
+            setStatus: function (status_text) {
+                var $status = this.$el.find('.toolbar .status');
+
+                status_text = status_text || '';
+                $status.slideUp('fast', function() {
+                    $status.text(status_text);
+                    $status.slideDown();
+                });
+            }
+        });
+
+
+
+        var applet = Backbone.Model.extend({
+            initialize: function () {
+                var that = this;
+
+                this.set('title', 'Script Editor');
+                this.view = new view({model: this})
+
+            }
+        });
+
+
+        _kiwi.model.Applet.register('kiwi_script_editor', applet);
+        //_kiwi.model.Applet.loadOnce('kiwi_script_editor');
+    })();
\ No newline at end of file
diff --git a/client/assets/dev/build.js b/client/assets/dev/build.js
index 9db3895..e856a85 100644
--- a/client/assets/dev/build.js
+++ b/client/assets/dev/build.js
@@ -46,6 +46,7 @@ var src = concat([
     __dirname + '/applet_settings.js',
     __dirname + '/applet_nickserv.js',
     __dirname + '/applet_chanlist.js',
+    __dirname + '/applet_scripteditor.js',
 
     __dirname + '/utils.js',
     __dirname + '/view.js'
diff --git a/client/assets/dev/index.html.tmpl b/client/assets/dev/index.html.tmpl
index c1a85c2..efe8ea2 100644
--- a/client/assets/dev/index.html.tmpl
+++ b/client/assets/dev/index.html.tmpl
@@ -206,6 +206,22 @@
     </script>
 
 
+    <script type="text/html" id="tmpl_script_editor">
+        <div style="height:100%;">
+            <style>
+                #kiwi .script_editor .toolbar { padding: 10px 20px; }
+                #kiwi .script_editor .toolbar span.status { margin-left:2em; font-style:italic; }
+                #kiwi .script_editor .toolbar button { height:30px; padding:0 1em; }
+                #kiwi .script_editor .toolbar button i { font-size:1.2em; margin-left:3px; }
+            </style>
+            <div class="script_editor" style="height:100%; position:relative;">
+                <div class="toolbar"><button class="btn_save">Save <i class="icon-save"></i></button><span class="status"></span></div>
+                <div class="editor" style="position:absolute;top:50px;bottom:0px;left:0px;right:0px;"></div>
+            </div>
+        </div>
+    </script>
+
+
 <script>
 /* Script loader (https://github.com/ded/script.js) */
 (function(a,b,c){typeof c["module"]!="undefined"&&c.module.exports?c.module.exports=b():typeof c["define"]!="undefined"&&c["define"]=="function"&&c.define.amd?define(a,b):c[a]=b()})("$script",function(){function p(a,b){for(var c=0,d=a.length;c<d;++c)if(!b(a[c]))return j;return 1}function q(a,b){p(a,function(a){return!b(a)})}function r(a,b,i){function o(a){return a.call?a():d[a]}function t(){if(!--n){d[m]=1,l&&l();for(var a in f)p(a.split("|"),o)&&!q(f[a],o)&&(f[a]=[])}}a=a[k]?a:[a];var j=b&&b.call,l=j?b:i,m=j?a.join(""):b,n=a.length;return setTimeout(function(){q(a,function(a){if(h[a])return m&&(e[m]=1),h[a]==2&&t();h[a]=1,m&&(e[m]=1),s(!c.test(a)&&g?g+a+".js":a,t)})},0),r}function s(c,d){var e=a.createElement("script"),f=j;e.onload=e.onerror=e[o]=function(){if(e[m]&&!/^c|loade/.test(e[m])||f)return;e.onload=e[o]=null,f=1,h[c]=2,d()},e.async=1,e.src=c,b.insertBefore(e,b.firstChild)}var a=document,b=a.getElementsByTagName("head")[0],c=/^https?:\/\//,d={},e={},f={},g,h={},i="string",j=!1,k="push",l="DOMContentLoaded",m="readyState",n="addEventListener",o="onreadystatechange";return!a[m]&&a[n]&&(a[n](l,function t(){a.removeEventListener(l,t,j),a[m]="complete"},j),a[m]="loading"),r.get=s,r.order=function(a,b,c){(function d(e){e=a.shift(),a.length?r(e,d):r(e,b,c)})()},r.path=function(a){g=a},r.ready=function(a,b,c){a=a[k]?a:[a];var e=[];return!q(a,function(a){d[a]||e[k](a)})&&p(a,function(a){return d[a]})?b():!function(a){f[a]=f[a]||[],f[a][k](b),c&&c(e)}(a.join("|")),r},r},this)
@@ -258,7 +274,8 @@
                 [
                     'dev/applet_settings.js',
                     'dev/applet_nickserv.js',
-                    'dev/applet_chanlist.js'
+                    'dev/applet_chanlist.js',
+                    'dev/applet_scripteditor.js'
                 ],
 
                 [
diff --git a/client/assets/dev/model_application.js b/client/assets/dev/model_application.js
index c6400ba..67bf66e 100644
--- a/client/assets/dev/model_application.js
+++ b/client/assets/dev/model_application.js
@@ -908,6 +908,7 @@ _kiwi.model.Application = function () {
 
             controlbox.on('command:applet', appletCommand);
             controlbox.on('command:settings', settingsCommand);
+            controlbox.on('command:script', scriptCommand);
         };
 
         // A fallback action. Send a raw command to the server
@@ -1067,6 +1068,11 @@ _kiwi.model.Application = function () {
             settings.view.show();
         }
 
+        function scriptCommand (ev) {
+            var editor = _kiwi.model.Applet.loadOnce('kiwi_script_editor');
+            editor.view.show();
+        }
+
         function appletCommand (ev) {
             if (!ev.params[0]) return;
 
diff --git a/client/assets/dev/model_gateway.js b/client/assets/dev/model_gateway.js
index 61c6a45..31766ea 100644
--- a/client/assets/dev/model_gateway.js
+++ b/client/assets/dev/model_gateway.js
@@ -111,6 +111,13 @@ _kiwi.model.Gateway = function () {
             that.trigger('topic:' + event.channel, event);
             that.trigger('topic', event);
         });
+
+
+        this.on('onjoin', function (event) {
+            that.trigger('join:' + event.channel, event);
+            that.trigger('join', event);
+        });
+
     };
 
 
diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js
index dc7e554..0e20aec 100644
--- a/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@ -1131,7 +1131,7 @@ _kiwi.view.Application = Backbone.View.extend({
         }
 
         // If we're typing into an input box somewhere, ignore
-        if ((ev.target.tagName.toLowerCase() === 'input') || $(ev.target).attr('contenteditable')) {
+        if ((ev.target.tagName.toLowerCase() === 'input') || (ev.target.tagName.toLowerCase() === 'textarea') || $(ev.target).attr('contenteditable')) {
             return;
         }