Changeset 951

Timestamp:

01/27/08 17:13:50 (4 years ago)

Author:

ray

Message:

• one more attempt to properly fix #1136
  
• added compression script for yui_compressor (though not going to use it)
  
• removed some evitable uses of eval()
  
• removed alerts for very old Geckos, because the seem to fire with recent versions of Safari
  

Location:

trunk

Files:

• Xinha.css (modified) (1 diff)
• XinhaCore.js (modified) (5 diffs)
• contrib/compress.php (modified) (5 diffs)
• contrib/compress_yui.php (added)

trunk/Xinha.css

@@ -71 +71 @@
 .htmlarea .toolbar select:hover,
 .htmlarea .toolbar select:active { 
- /* These settings don't work with Firefox 3 Linux
-  margin-top: 2px;
-  margin-bottom: 1px;
-  height: 17px;
-*/
+  position:relative;
+  top:-2px;
+  margin-bottom:-2px;
   color: ButtonText;
 }

trunk/XinhaCore.js

@@ -178 +178 @@
 Xinha.checkSupportedBrowser = function()
 {
-  if ( Xinha.is_gecko )
-  {
-    if ( navigator.productSub < 20021201 )
-    {
-      alert("You need at least Mozilla-1.3 Alpha.\nSorry, your Gecko is not supported.");
-      return false;
-    }
-    if ( navigator.productSub < 20030210 )
-    {
-      alert("Mozilla < 1.3 Beta is not supported!\nI'll try, though, but it might not work.");
-    }
-  }
   if ( Xinha.is_opera )
   {
@@ -476 +464 @@
 Xinha.Config = function()
 {
-  var cfg = this;
   this.version = Xinha.version.Revision;
   
@@ -3212 +3199 @@
   var plugin = arguments[0];
 
-  // @todo : try to avoid the use of eval()
   // We can only register plugins that have been succesfully loaded
-  if ( plugin === null || typeof plugin == 'undefined' || (typeof plugin == 'string' && eval('typeof ' + plugin) == 'undefined') )
+  if ( plugin === null || typeof plugin == 'undefined' || (typeof plugin == 'string' && typeof window[plugin] == 'undefined') )
   {
     return false;
@@ -3234 +3220 @@
 Xinha.prototype.registerPlugin2 = function(plugin, args)
 {
-  // @todo : try to avoid the use of eval()
-  if ( typeof plugin == "string" )
-  {
-    plugin = eval(plugin);
+  if ( typeof plugin == "string" && typeof window[plugin] == 'function' )
+  {
+    plugin = window[plugin];
   }
   if ( typeof plugin == "undefined" )
@@ -3287 +3272 @@
   
   Xinha.setLoadingMessage (Xinha._lc("Loading plugin $plugin="+pluginName+"$"));
-  // @todo : try to avoid the use of eval()
+
   // Might already be loaded
-  //if ( eval('typeof ' + pluginName) != 'undefined' )
-  // @todo: try if this works to avoid the use of eval, I've been never getting here when testing
   if ( typeof window['pluginName'] != 'undefined' )
   {

trunk/contrib/compress.php

@@ -1 +1 @@
 <?
 die("Run this script to batch-compress the current Xinha snapshot. To run the script, open the file and comment out the die() command");
-
+$repository_url = 'http://svn.xinha.webfactional.com/trunk';
+$version ='';
+$date = date('r');
 error_reporting(E_ALL);
 ini_set('show_errors',1);
 
 $return = array();
-function scan($dir, $durl = '',$min_size="3000")
+function scan($dir, $durl = '',$min_size="0")
 {
         static $seen = array();
@@ -48 +50 @@
 scan("../");
 $cwd = getcwd();
+
+$root_dir = realpath($cwd.'/..');
+
 print "Processing ".count($return)." files<br />";
 
-$prefix = "/* This compressed file is part of Xinha. For uncomressed sources, forum, and bug reports, go to xinha.org */";
+$prefix = "/* This compressed file is part of Xinha. For uncompressed sources, forum, and bug reports, go to xinha.org */";
+if ($version) $prefix .= "\n/* This file is part of version $version released $date */";
+
 $core_prefix = '
   /*--------------------------------------------------------------------------
@@ -58 +65 @@
     --  BSD license)  please read license.txt in this package for details.
     --
-    --  Copyright (c) 2005-2007 Xinha Developer Team and contributors
+    --  Copyright (c) 2005-2008 Xinha Developer Team and contributors
     --  
     --  Xinha was originally based on work by Mihai Bazon which is:
@@ -71 +78 @@
         print "Processed $file<br />";
         flush();
+        $file_url = $repository_url.str_replace($root_dir,'',$file);
+
         copy($file,$file."_uncompr.js");
-
-        exec("echo \"".(preg_match('/XinhaCore.js$/',$file) ? $prefix.$core_prefix : $prefix)."\" > $file && java -jar ${cwd}/dojo_js_compressor.jar -c ${file}_uncompr.js >> $file 2>&1");
+        
+        $file_prefix = $prefix."\n/* The URL of the most recent version of this file is $file_url */";
+        
+        exec("echo \"".(preg_match('/XinhaCore.js$/',$file) ? $file_prefix.$core_prefix : $file_prefix)."\" > $file && java -jar ${cwd}/dojo_js_compressor.jar -c ${file}_uncompr.js >> $file 2>&1");
         if (preg_match('/js: ".*?", line \d+:/',file_get_contents($file)))
         {
@@ -83 +94 @@
                 unlink($file."_uncompr.js");
         }
+
 }
 print "Operation complete."