[kupu-checkins] r38538 - in kupu/trunk/kupu: . common

[duncan at codespeak.net]

Author: duncan
Date: Mon Feb 12 10:49:42 2007
New Revision: 38538

Modified:
   kupu/trunk/kupu/common/kupudrawers.js
   kupu/trunk/kupu/jslint.js
   kupu/trunk/kupu/lint.py
Log:
Fix lint error in kupudrawers.js.
Modified jslint.js so it also works with Windows scripting host.
lint.py now chooses WSH for win32, Rhino for other platforms.

Modified: kupu/trunk/kupu/common/kupudrawers.js
==============================================================================
--- kupu/trunk/kupu/common/kupudrawers.js	(original)
+++ kupu/trunk/kupu/common/kupudrawers.js	Mon Feb 12 10:49:42 2007
@@ -1288,7 +1288,7 @@
             alert("Please enter a title for the image you are uploading");
             return;        
         };
-        form.node_prop_desc.value = form.node_prop_desc.value.replace(/^\xa0|\xa0$/g,'')
+        form.node_prop_desc.value = form.node_prop_desc.value.replace(/^\xa0|\xa0$/g,'');
         form.submit();
     };
     

Modified: kupu/trunk/kupu/jslint.js
==============================================================================
--- kupu/trunk/kupu/jslint.js	(original)
+++ kupu/trunk/kupu/jslint.js	Mon Feb 12 10:49:42 2007
@@ -3002,6 +3002,31 @@
     return result;
 }
 
+if (WScript) {
+    var arguments = [];
+    for (var arg = 0; arg < WScript.Arguments.Count(); arg++) {
+        arguments.push(WScript.Arguments(arg));
+    }
+    var print = function() {
+        for (var i = 0; i < arguments.length; i++) {
+            try {
+                WScript.StdOut.WriteLine(arguments[i]);
+            } catch(e) {
+                WScript.Echo("Run this program using the command-line script program:\n"+
+                    "    cscript "+WScript.ScriptFullName+" [arguments]\n"+
+                    "Don't run it with wscript.\n"+
+                    "Use --help for usage text\n");
+                WScript.Quit();
+            }
+        }
+    }
+    var quit = function(n) { WScript.Quit(n); };
+    var readFile = function(fname) {
+        var filesys = WScript.CreateObject("Scripting.FileSystemObject");
+        var file = filesys.OpenTextFile(fname, 1);
+        return file.ReadAll();
+    };
+};
 (function (a) {
     function lintfile(arg, filename, options) {
         var input = readFile(filename);

Modified: kupu/trunk/kupu/lint.py
==============================================================================
--- kupu/trunk/kupu/lint.py	(original)
+++ kupu/trunk/kupu/lint.py	Mon Feb 12 10:49:42 2007
@@ -12,6 +12,8 @@
 import cPickle
 
 COMPILE_COMMAND = "java org.mozilla.javascript.tools.shell.Main %(lint)s --options %(options)s %(file)s"
+if sys.platform=='win32':
+    COMPILE_COMMAND = "cscript /NoLogo %(lint)s --options %(options)s %(file)s"
 
 def lint(name):
     cmd = COMPILE_COMMAND % dict(lint=LINT, file=name, options=OPTIONS)
@@ -54,8 +56,12 @@
         f = open(name, 'rb')
     except (IOError, WindowsError):
         return {}
-    data = cPickle.load(f)
-    f.close()
+    try:
+        data = cPickle.load(f)
+    except EOFError:
+        return {}
+    finally:
+        f.close()
     return data
 
 def savestatus(name, status):
@@ -68,3 +74,4 @@
     for n in newfiles(status, 'common/*.js', 'plone/kupu_plone_layer/*.js'):
         lint(n)
         savestatus(STATUSFILE, status)
+