Changeset 7016

Timestamp:

May 7, 2008, 7:03:48 PM (12 years ago)

Author:

ebihara

Message:

#2223:カラーピッカーの各色の表示幅とリンクの幅がずれ、カラーピッカーの一部しか反応しない状態になる環境があったのを修正

File:

• OpenPNE/trunk/public_html/js/pne.js (modified) (6 diffs)

OpenPNE/trunk/public_html/js/pne.js

@@ -94 +94 @@
 
     var button = document.getElementById("mce_textmode_button_op_color");
-    var x = button.offsetLeft;
 
     var button_container = document.getElementById("mce_editor_buttonmenu");
@@ -111 +110 @@
 
         var td = document.createElement("td");
-        td.style.backgroundColor = "#" + settings.colors[i];
-        td.style.height = "10px";
-        td.style.border = "1px solid white";
+        td.style.border = "0 none";
+        td.style.width = "12px";
+        td.style.padding = "2px";
+        td.style.margin = "0";
 
         var a = document.createElement("a");
@@ -121 +121 @@
         a.style.height = "9px";
         a.style.display = "block";
+        a.style.overflow = "hidden";
+        a.style.border = "1px solid #808080";
+        a.style.backgroundColor = "#" + settings.colors[i];
         a.onclick = function() {
             pne_mce_insert_tagname(id, tagname, ' code="' + this.colorCode + '"');
@@ -127 +130 @@
         };
 
+        var span = document.createElement("span");
+        span.style.display = "none";
+        span.appendChild(document.createTextNode(code));
+
+        a.appendChild(span);
         td.appendChild(a);
         tr.appendChild(td);
@@ -133 +141 @@
     var table = document.createElement("table");
     table.id = "mce_editor_color_table";
-    table.style.width = "150px";
+    table.style.width = "auto";
     table.style.position = "absolute";
-    table.style.left = x + 150 + "px";
     table.style.zIndex = 150;
-    table.style.padding = "5px";
     table.style.border = "1px solid gray";
     table.style.backgroundColor = "#fff";
@@ -143 +149 @@
 
     button_container.appendChild(table);
+
+    if (Prototype.Browser.IE) {
+        table.style.left = button.parentNode.offsetWidth + button.offsetWidth + "px";
+        table.style.top = table.offsetTop + button.offsetHeight;
+    } else {
+        table.style.left = button.offsetLeft + table.offsetLeft + "px";
+    }
 }