Changeset 6614

Timestamp:

09/03/08 21:09:43 (19 months ago)

Author:

inureyes

Message:

refs #1082

• 1.7 트리에 [6611] [6612] [6613] 반영

Location:

branches/1.7

Files:

• plugins/FM_Modern/editor.js (modified) (3 diffs)
• plugins/FM_Modern/index.php (modified) (1 diff)
• plugins/FM_Modern/index.xml (modified) (1 diff)
• script/EAF4.js (modified) (1 diff)

branches/1.7/plugins/FM_Modern/editor.js

@@ -84 +84 @@
 TTModernEditor.prototype.initialize = function(textarea) {
     // execCommand가 사용가능한 경우에만 위지윅을 쓸 수 있다. (지금은 Internet Explorer, Firefox, Safari 3만 지원한다)
-    if(typeof(document.execCommand) == "undefined" || !(STD.isIE || STD.isFirefox || STD.isSafari3))
+    if(typeof(document.execCommand) == "undefined" || !(STD.isIE || STD.isFirefox || (STD.isWebkit && STD.engineVersion >= 419.3)))
         return;
     // Set editor mode for formatters.
@@ -1603 +1603 @@
 
     // safari 3 workaround: collect the last selection range for object insertion
-    if (STD.isSafari3) {
+    if (STD.isWebkit && STD.engineVersion >= 419.3) {
         var range = this.getSelectionRange();
         if (range) this.lastSelectionRange = range;
@@ -1654 +1654 @@
     // 이벤트가 발생하면 showProperty 함수에서 TTML 치환자인지 아닌지 판단해, TTML 치환자일 경우에 속성을 수정할 수 있는 창을 띄워주게 된다
     if(this.selectedElement && !isFunctionalKeyPressed) {
-        if (this.showProperty(this.selectedElement) && STD.isSafari3) {
+        if (this.showProperty(this.selectedElement) && (STD.isWebkit && STD.engineVersion >= 419.3)) {
             // safari 3 workaround: put current element in the selection
             var range = this.contentDocument.createRange();

branches/1.7/plugins/FM_Modern/index.php

@@ -29 +29 @@
     ob_start();
 ?>
-            if (typeof(document.execCommand) == "undefined" || !(STD.isIE || STD.isFirefox || STD.isSafari3)) return null;
+            if (typeof(document.execCommand) == "undefined" || !(STD.isIE || STD.isFirefox || (STD.isWebkit && STD.engineVersion >= 419.3)) return null;
             var editor = new TTModernEditor();
             editor.fixPosition = <?php echo getBlogSetting('editorPropertyPositionFix', 0);?>;

branches/1.7/plugins/FM_Modern/index.xml

@@ -12 +12 @@
     <safety changeData="no" exposeData="no" accessLocal="no" accessRemote="no" accessRaw="no" />
     <requirements>
-        <textcube>1.7</textcube>
+        <textcube>1.8</textcube>
     </requirements>
     <binding>

branches/1.7/script/EAF4.js

@@ -21 +21 @@
 Standardizer.prototype.name      = "Eolin Standardizer";
 Standardizer.prototype.verion    = "1.0";
-Standardizer.prototype.copyright = "Copyright (c) 2005,2007 Needlworks / Tatter & Company. All rights reserved.";
+Standardizer.prototype.copyright = "Copyright (c) 2005,2008 Needlworks / Tatter & Company. All rights reserved.";
 
 function Standardizer(){};
 
-Standardizer.prototype.isIE = (navigator.userAgent.indexOf("MSIE")>=0 && document.all);
-Standardizer.prototype.isIE6 = (navigator.userAgent.indexOf("MSIE 6.")>=0  && document.all);
-Standardizer.prototype.isFirefox = (navigator.userAgent.indexOf("Firefox")>=0 || navigator.userAgent.indexOf("IceWeasel")>=0);
-Standardizer.prototype.isSafari = (navigator.userAgent.indexOf("Safari")>=0);
-Standardizer.prototype.isSafari3 = (navigator.userAgent.indexOf("Safari")>=0 && navigator.userAgent.indexOf("Version/3")>0);
-Standardizer.prototype.isOpera = (!Standardizer.prototype.isIE&&(navigator.userAgent.indexOf("Opera")>=0));
-Standardizer.prototype.isMozilla = (!Standardizer.prototype.isIE && !Standardizer.prototype.isFirefox && !Standardizer.prototype.isSafari && !Standardizer.prototype.isOpera && (navigator.userAgent.indexOf("Mozilla")>=0));
-
+var ua = navigator.userAgent;
+// Microsoft Explorer
+Standardizer.prototype.isIE = (ua.indexOf("MSIE")>=0 && document.all);
+if(Standardizer.prototype.isIE) {
+    Standardizer.prototype.browserVersion  = parseFloat(ua.substr(Math.max(ua.indexOf("MSIE"),0)+4,4));
+    Standardizer.prototype.engineVersion  = Standardizer.prototype.browserVersion;
+}
+// Mozilla Firefox
+Standardizer.prototype.isFirefox = (ua.indexOf("Firefox")>=0 || ua.indexOf("IceWeasel")>=0 || ua.indexOf("Minefield")>0);
+if(Standardizer.prototype.isFirefox) {
+    Standardizer.prototype.browserVersion  = parseFloat(ua.substr(ua.indexOf("Firefox/")+8,10));
+    Standardizer.prototype.engineVersion  = parseFloat(ua.substr(Math.max(ua.indexOf("rv:"),0)+3,7));
+}
+// Webkit / safari
+webkitIndex = Math.max(ua.indexOf("WebKit"), ua.indexOf("Safari"),0);
+Standardizer.prototype.isSafari = (ua.indexOf("Safari")>=0);
+Standardizer.prototype.isWebkit = (webkitIndex > 0);
+if(Standardizer.prototype.isWebkit) {
+    Standardizer.prototype.browserVersion  = parseFloat(ua.split("Version/")[1]) || ( ( parseFloat(ua.substr(webkitIndex+7)) >= 419.3 ) ? 3 : 2 ) || 2;
+    Standardizer.prototype.engineVersion  = parseFloat(ua.substr(webkitIndex+7));
+}
+// Opera
+Standardizer.prototype.isOpera = (!Standardizer.prototype.isIE&&(ua.indexOf("Opera")>=0));
+// Mozilla-compartible
+Standardizer.prototype.isMozilla = (!Standardizer.prototype.isIE && !Standardizer.prototype.isFirefox && !Standardizer.prototype.isSafari && !Standardizer.prototype.isOpera && (ua.indexOf("Mozilla")>=0));
 Standardizer.prototype.addEventListener = function(object) {
     if(!object.addEventListener)