Update of /var/cvs/applications/editwizard/templates/htmlarea
In directory
james.mmbase.org:/tmp/cvs-serv25215/applications/editwizard/templates/htmlarea
Modified Files:
Tag: MMBase-1_8
htmlarea.js
Log Message:
MMB-1110 Htmlarea annoys user with not-supported warnings
See also:
http://cvs.mmbase.org/viewcvs/applications/editwizard/templates/htmlarea
See also: http://www.mmbase.org/jira/browse/MMB-1110
Index: htmlarea.js
===================================================================
RCS file: /var/cvs/applications/editwizard/templates/htmlarea/htmlarea.js,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -b -r1.14 -r1.14.2.1
--- htmlarea.js 31 May 2006 13:55:37 -0000 1.14
+++ htmlarea.js 21 Jan 2008 14:16:04 -0000 1.14.2.1
@@ -9,7 +9,7 @@
// Version 3.0 developed by Mihai Bazon.
// http://dynarch.com/mishoo
//
-// $Id: htmlarea.js,v 1.14 2006/05/31 13:55:37 johannes Exp $
+// $Id: htmlarea.js,v 1.14.2.1 2008/01/21 14:16:04 nklasens Exp $
if (typeof _editor_url == "string") {
// Leave exactly one backslash at the end of _editor_url
@@ -1794,10 +1794,11 @@
HTMLArea.agt = navigator.userAgent.toLowerCase();
HTMLArea.is_ie = ((HTMLArea.agt.indexOf("msie") != -1) &&
(HTMLArea.agt.indexOf("opera") == -1));
HTMLArea.is_opera = (HTMLArea.agt.indexOf("opera") != -1);
+HTMLArea.is_safari = (HTMLArea.agt.indexOf("safari") != -1);
HTMLArea.is_mac = (HTMLArea.agt.indexOf("mac") != -1);
HTMLArea.is_mac_ie = (HTMLArea.is_ie && HTMLArea.is_mac);
HTMLArea.is_win_ie = (HTMLArea.is_ie && !HTMLArea.is_mac);
-HTMLArea.is_gecko = (navigator.product == "Gecko");
+HTMLArea.is_gecko = ((navigator.product == "Gecko") && !HTMLArea.is_safari);
// Safari lies!
// variable used to pass the object to the popup editor window.
HTMLArea._object = null;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
