1 files changed, 11 insertions, 3 deletions
diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 34bd8113d..cdfed0a84 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -128,7 +128,7 @@ function initToolbar(tbid,edid,tb){
 		if(!document.getElementById){ return; }
     var toolbar = document.getElementById(tbid);
     var cnt = tb.length;
-    for(i=0; i<cnt; i++){
+    for(var i=0; i<cnt; i++){
         // create new button and add to the toolbar
         btn = createToolButton(tb[i]['icon'],
                                tb[i]['title'],
@@ -154,6 +154,14 @@ function initToolbar(tbid,edid,tb){
                                         jsEscape(tb[i]['insert'])+
                                     "');return false;}");
                 break;
+            case 'signature':
+								if(SIG!=''){
+		                eval("btn.onclick = function(){insertAtCarret('"+
+    		                                    jsEscape(edid)+"','"+
+        		                                jsEscape(SIG)+
+            		                        "');return false;}");
+								}
+                break;
             case 'picker':
                 createPicker('picker'+i,
                              tb[i]['list'],
@@ -162,9 +170,9 @@ function initToolbar(tbid,edid,tb){
                 eval("btn.onclick = function(){showPicker('picker"+i+
                                     "',this);return false;}");
                 break;
-            case 'popup':
+            case 'mediapopup':
                 eval("btn.onclick = function(){window.open('"+
-                                        jsEscape(tb[i]['url'])+"','"+
+                                        jsEscape(tb[i]['url']+NS)+"','"+
                                         jsEscape(tb[i]['name'])+"','"+
                                         jsEscape(tb[i]['options'])+
                                     "');return false;}");