Changeset 8

Timestamp:

02/13/05 07:45:00 (8 years ago)

Author:

gogo

Message:

Fixes to work with the Combined-Image-Buttons and work better with multiuple editors.

It's not quite right yet, I can't get the images to show.

Files:

• trunk/plugins/ContextMenu/context-menu.js (modified) (5 diffs)

trunk/plugins/ContextMenu/context-menu.js

@@ -105 +105 @@
                         elmenus.push(null,
                                      [ i18n["Modify Link"],
-                                       function() { editor.execCommand("createlink", true); },
+               function() { editor.config.btnList['createlink'][3](editor); },
                                        i18n["Current URL is"] + ': ' + link.href,
                                        config.btnList["createlink"][1] ],
@@ -206 +206 @@
         if (selection && !link)
                 menu.push(null, [ i18n["Make link"],
-                                  function() { editor.execCommand("createlink", true); },
+           function() { editor.config.btnList['createlink'][3](editor); },
                                   i18n["Create a link"],
                                   config.btnList["createlink"][1] ]);
@@ -301 +301 @@
         };
         var target = HTMLArea.is_ie ? ev.srcElement : ev.target;
-        var ifpos = getPos(self.editor._iframe);
+     var ifpos = getPos(self.editor._htmlArea);//_iframe);
         var x = ev.clientX + ifpos.x;
         var y = ev.clientY + ifpos.y;
@@ -383 +383 @@
                         td1.className = "icon";
                         if (item.__msh.icon)
-                                td1.innerHTML = "<img align='middle' src='" + item.__msh.icon + "' />";
-                        var td2 = doc.createElement("td");
+      {
+        var t = HTMLArea.makeBtnImg(item.__msh.icon, doc);
+        td1.appendChild(t);
+        // td1.innerHTML = "<img align='middle' src='" + item.__msh.icon + "' />";
+      }
+      var td2 = doc.createElement("td");
                         if (HTMLArea.is_ie)
                                 td2.unselectable = "on";
@@ -415 +419 @@
 
         if (!HTMLArea.is_ie) {
+    /* FIXME: I think this is to stop the popup from running off the bottom of the screen?
                 var dx = x + div.offsetWidth - window.innerWidth + 4;
                 var dy = y + div.offsetHeight - window.innerHeight + 4;
+    // alert('dy= (' + y + '+' + div.offsetHeight + '-' + window.innerHeight + ' + 4 ) = ' + dy);
                 if (dx > 0) x -= dx;
                 if (dy > 0) y -= dy;
+    */
                 div.style.left = x + "px";
                 div.style.top = y + "px";