[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kupu-checkins
Subject:    [kupu-checkins] r35670 - in kupu/trunk/kupu: . common plone
From:       duncan () codespeak ! net
Date:       2006-12-13 12:29:46
Message-ID: 20061213122946.6F42210075 () code0 ! codespeak ! net
[Download RAW message or body]

Author: duncan
Date: Wed Dec 13 13:29:42 2006
New Revision: 35670

Modified:
   kupu/trunk/kupu/Makefile
   kupu/trunk/kupu/common/kupu_kjax.js
   kupu/trunk/kupu/make.bat
   kupu/trunk/kupu/plone/html2captioned.py
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_migration.xml.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Make link fixing less aggressive.

Modified: kupu/trunk/kupu/Makefile
==============================================================================
--- kupu/trunk/kupu/Makefile	(original)
+++ kupu/trunk/kupu/Makefile	Wed Dec 13 13:29:42 2006
@@ -43,7 +43,6 @@
 lenyamacros:
 	$(XSLTPROC) $(XSLTPROC_PARAMS) -o apache-lenya/kupu/kupumacros.html $(XSL_FILE) \
dist-apache-lenya.kupu  
-
 #used by kupu-18n.jar
 $(JAVA_DIR)/kupu-defaults.po: i18n/kupu.pot
 	mkdir -p $(JAVA_DIR)

Modified: kupu/trunk/kupu/common/kupu_kjax.js
==============================================================================
--- kupu/trunk/kupu/common/kupu_kjax.js	(original)
+++ kupu/trunk/kupu/common/kupu_kjax.js	Wed Dec 13 13:29:42 2006
@@ -105,7 +105,12 @@
         var next = this.xmldata.selectSingleNode('//*[@kj:next]');
         if (next) {
             var xmluri = next.getAttribute('kj:next');
-            this._loadXML(xmluri, this._xmlcallback);
+            var delay = next.getAttribute('kj:delay');
+            if (delay) {
+                timer_instance.registerFunction(this, this._loadXML, delay*1000, \
xmluri, this._xmlcallback); +            } else {
+                this._loadXML(xmluri, this._xmlcallback);
+            };
         } else {
             this.trace("complete");
         };

Modified: kupu/trunk/kupu/make.bat
==============================================================================
--- kupu/trunk/kupu/make.bat	(original)
+++ kupu/trunk/kupu/make.bat	Wed Dec 13 13:29:42 2006
@@ -6,6 +6,7 @@
 :cmdok
 setlocal
 setlocal enabledelayedexpansion
+cd %~P0
 
 call :searchpath xsltproc.exe
 if errorlevel 1 goto :eof
@@ -79,6 +80,15 @@
     %X%%XSLTPROC% %XSLTPROC_PARAMS% -o apache-lenya\kupu\kupumacros.html %XSL_FILE% \
dist-apache-lenya.kupu  goto :eof
 
+:target_lint
+    echo before lint %ERRORLEVEL%
+    echo on
+    for %%f in (common\*.js) do (
+%X%java org.mozilla.javascript.tools.shell.Main jslint.js %%f
+if !ERRORLEVEL!==1 goto :eof
+)
+    goto :eof
+
 :target_
 :target_all
     call :target_clean

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Wed Dec 13 13:29:42 2006
@@ -230,7 +230,7 @@
         self._firstoutput = True
         self.found = 0
         self.position = 0
-        self.batch_size = 1
+        self.batch_size = 5
         self.uids = rfg('uids')
 
     def saveState(self):
@@ -267,6 +267,8 @@
         info = {}
         if self._continue:
             info['nexturi'] = \
self.tool.absolute_url_path()+'/kupu_migration.xml?button=continue' +            if \
self.commit_changes: +                info['delay'] = 5 # Avoid killing everyone else \
with conflict errors.  else:
             info['nexturi'] = None
 

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_migration.xml.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_migration.xml.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_migration.xml.pt	Wed Dec 13 13:29:42 \
2006 @@ -83,7 +83,7 @@
 
       <div tal:condition="not:wantform">
         <tal:var tal:define="m python:context.link_migration();">
-          <div tal:condition="m/nexturi" tal:attributes="kj:next m/nexturi" />
+          <div tal:condition="m/nexturi" tal:attributes="kj:next m/nexturi;kj:delay \
                m/delay|nothing" />
           <div id="kupu-output" kj:mode="replace" tal:condition="m/firstoutput" />
           <div id="target" kj:mode="replace">
             <!-- <pre tal:content="context/link_migration">current status</pre> -->

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	Wed Dec 13 \
13:29:42 2006 @@ -14,15 +14,15 @@
     <!--$Id: contextmenu.kupu 9520 2005-02-26 16:30:23Z duncan $-->
     <!--$Id: toolbar.kupu 27597 2006-05-22 14:27:32Z guido $-->
     <!--$Id: toolboxes.kupu 16467 2005-08-25 11:08:10Z guido $-->
-    <!--$Id: colorchooser.kupu 9520 2005-02-26 16:30:23Z duncan $-->
+    <!--$Id: colorchooser.kupu 35491 2006-12-08 15:41:49Z duncan $-->
     <!--$Id: save.kupu 9520 2005-02-26 16:30:23Z duncan $-->
     <!--$Id: drawers.kupu 32938 2006-10-06 06:56:24Z guido $-->
-    <!--$Id: include.kupu 9520 2005-02-26 16:30:23Z duncan $-->
+    <!--$Id: include.kupu 35491 2006-12-08 15:41:49Z duncan $-->
     <!--$Id: wire.kupu 25247 2006-04-03 11:23:02Z fschulze $-->
     <!--$Id: head.kupu 34332 2006-11-07 14:50:40Z duncan $-->
     <!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
     <!--$Id: body.kupu 34311 2006-11-07 11:18:23Z duncan $-->
-    <!--$Id: toolbar.kupu 35477 2006-12-08 13:20:38Z duncan $-->
+    <!--$Id: toolbar.kupu 35491 2006-12-08 15:41:49Z duncan $-->
     <!--$Id: drawers.kupu 35477 2006-12-08 13:20:38Z duncan $-->
     <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->
     <!--$Id: sourceedit.kupu 35477 2006-12-08 13:20:38Z duncan $-->


[prev in list] [next in list] [prev in thread] [next in thread]