r666 - in zope-kupu/trunk: . Extensions common debian default doc plone plone/kupu_plone_layer silva tests

Fabio Tranchitella kobold at alioth.debian.org
Fri Feb 9 15:51:52 CET 2007 

Author: kobold
Date: 2007-02-09 15:51:51 +0100 (Fri, 09 Feb 2007)
New Revision: 666

Modified:
   zope-kupu/trunk/Extensions/Install.py
   zope-kupu/trunk/__init__.py
   zope-kupu/trunk/common/kupubasetools.js
   zope-kupu/trunk/common/kupucontentfilters.js
   zope-kupu/trunk/common/kupudrawers.js
   zope-kupu/trunk/common/kupueditor.js
   zope-kupu/trunk/common/kupuhelpers.js
   zope-kupu/trunk/common/kupusaveonpart.js
   zope-kupu/trunk/common/kupusourceedit.js
   zope-kupu/trunk/common/sarissa.js
   zope-kupu/trunk/debian/changelog
   zope-kupu/trunk/default/drawers.kupu
   zope-kupu/trunk/default/sourceedit.kupu
   zope-kupu/trunk/default/toolbar.kupu
   zope-kupu/trunk/doc/CHANGES.txt
   zope-kupu/trunk/plone/__init__.py
   zope-kupu/trunk/plone/body.kupu
   zope-kupu/trunk/plone/drawers.kupu
   zope-kupu/trunk/plone/head.kupu
   zope-kupu/trunk/plone/html2captioned.py
   zope-kupu/trunk/plone/kupu_plone_layer/kupuploneinit.js
   zope-kupu/trunk/plone/librarytool.py
   zope-kupu/trunk/plone/plonelibrarytool.py
   zope-kupu/trunk/plone/toolbar.kupu
   zope-kupu/trunk/plone/wire.kupu
   zope-kupu/trunk/plone/wysiwyg_support.kupu
   zope-kupu/trunk/plone/xmlconfig.kupu
   zope-kupu/trunk/silva/kupusilvainit.js
   zope-kupu/trunk/silva/kupusilvatools.js
   zope-kupu/trunk/tests/test_plone.js
   zope-kupu/trunk/version.txt
Log:
New upstream release.


Modified: zope-kupu/trunk/Extensions/Install.py
===================================================================
--- zope-kupu/trunk/Extensions/Install.py	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/Extensions/Install.py	2007-02-09 14:51:51 UTC (rev 666)
@@ -11,7 +11,7 @@
 
 This is best executed using CMFQuickInstaller
 
-$Id: Install.py 25043 2006-03-27 15:29:40Z fschulze $
+$Id: Install.py 25115 2006-03-29 15:13:39Z fschulze $
 """
 import os.path
 import sys

Modified: zope-kupu/trunk/__init__.py
===================================================================
--- zope-kupu/trunk/__init__.py	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/__init__.py	2007-02-09 14:51:51 UTC (rev 666)
@@ -12,7 +12,7 @@
 This module does some twirks to let us use kupu with Zope2, CMF/Plone
 and Zope3
 
-$Id: __init__.py 25040 2006-03-27 14:49:21Z fschulze $
+$Id: __init__.py 22394 2006-01-18 15:45:19Z guido $
 """
 
 # we need this for the CMF install script

Modified: zope-kupu/trunk/common/kupubasetools.js
===================================================================
--- zope-kupu/trunk/common/kupubasetools.js	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/common/kupubasetools.js	2007-02-09 14:51:51 UTC (rev 666)
@@ -8,7 +8,7 @@
  *
  *****************************************************************************/
 
-// $Id: kupubasetools.js 30992 2006-08-04 12:24:19Z duncan $
+// $Id: kupubasetools.js 34308 2006-11-07 10:10:48Z duncan $
 
 
 //----------------------------------------------------------------------------
@@ -2543,17 +2543,19 @@
         var width = window.innerWidth;
         var height = window.innerHeight;
     } else if (document.documentElement) {
-        var width = document.documentElement.offsetWidth-5;
-        var height = document.documentElement.offsetHeight-5;
+        if (!window._IE_VERSION) {
+            _IE_VERSION = /MSIE\s*([0-9.]*)/.exec(navigator.appVersion);
+        };
+        var kludge = (_IE_VERSION[1]<7)?5:0;
+        var width = document.documentElement.offsetWidth-kludge;
+        var height = document.documentElement.offsetHeight-kludge;
     } else {
         var width = document.body.offsetWidth-5;
         var height = document.body.offsetHeight-5;
     }
     width = width + 'px';
-    var offset = iframe.offsetTop;
-    if (sourceArea && sourceArea.offsetTop) offset = sourceArea.offsetTop-1;
-    var nheight = Math.max(height - offset -1/*top border*/, 10);
-    nheight = nheight + 'px';
+    var offset = iframe.parentNode.offsetTop;
+    var nheight = Math.max(height - offset -1/*top border*/, 10) + 'px';
     fulleditor.style.width = width; /*IE needs this*/
     iframe.style.width = width;
     iframe.style.height = nheight;

Modified: zope-kupu/trunk/common/kupucontentfilters.js
===================================================================
--- zope-kupu/trunk/common/kupucontentfilters.js	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/common/kupucontentfilters.js	2007-02-09 14:51:51 UTC (rev 666)
@@ -8,7 +8,7 @@
  *
  *****************************************************************************/
 
-// $Id: kupucontentfilters.js 27713 2006-05-26 10:32:29Z duncan $
+// $Id: kupucontentfilters.js 27715 2006-05-26 10:35:22Z duncan $
 
 
 //----------------------------------------------------------------------------

Modified: zope-kupu/trunk/common/kupudrawers.js
===================================================================
--- zope-kupu/trunk/common/kupudrawers.js	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/common/kupudrawers.js	2007-02-09 14:51:51 UTC (rev 666)
@@ -8,7 +8,7 @@
  * 
  *****************************************************************************/
 
-// $Id: kupudrawers.js 30992 2006-08-04 12:24:19Z duncan $
+// $Id: kupudrawers.js 34260 2006-11-06 10:14:31Z duncan $
 
 function DrawerTool() {
     /* a tool to open and fill drawers
@@ -472,7 +472,6 @@
         var doc = this._transformXml();
         var sourcenode = doc.selectSingleNode('//*[@id="'+id+'"]');
         var targetnode = document.getElementById(id);
-        sourcenode = document.importNode(sourcenode, true);
         Sarissa.copyChildNodes(sourcenode, targetnode);
         if (!this.focussed) {
             this.focusElement();
@@ -788,7 +787,7 @@
         if (this.editor.getBrowserName() == 'IE') {
             resultlib = resultlib.cloneNode(true);
         } else {
-            this.shared.xmldata.importNode(resultlib, true);
+            resultlib = this.shared.xmldata.importNode(resultlib, true);
         }
         var libraries = this.shared.xmldata.selectSingleNode("/libraries");
         libraries.appendChild(resultlib);

Modified: zope-kupu/trunk/common/kupueditor.js
===================================================================
--- zope-kupu/trunk/common/kupueditor.js	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/common/kupueditor.js	2007-02-09 14:51:51 UTC (rev 666)
@@ -8,7 +8,7 @@
  *
  *****************************************************************************/
 
-// $Id: kupueditor.js 18104 2005-10-03 14:10:11Z duncan $
+// $Id: kupueditor.js 34308 2006-11-07 10:10:48Z duncan $
 
 //----------------------------------------------------------------------------
 // Main classes
@@ -618,7 +618,7 @@
         for (var i = 0; i < bodies.length; i++) {
             data += Sarissa.serialize(bodies[i]);
         }
-        return this.escapeEntities(data);
+        return this.layoutsource(this.escapeEntities(data));
     };
 
     this.getHTMLBody = function() {
@@ -629,7 +629,7 @@
         for (var i = 0; i < bodies.length; i++) {
             data += bodies[i].innerHTML;
         }
-        return this.escapeEntities(data);
+        return this.layoutsource(this.escapeEntities(data));
     };
 
     // If we have multiple bodies this needs to remove the extras.
@@ -747,6 +747,13 @@
         
         return contents;
     };
+    this.layoutsource = function(data) {
+        data = data.replace(
+            /\s*(<(p|div|h.|ul|ol|dl|menu|dir|pre|blockquote|address|center|table|thead|tbody|tfoot|tr|th|td))\b/ig, '\n$1');
+        data = data.replace(
+            /\s*(<\/(p|div|h.|ul|ol|dl|menu|dir|pre|blockquote|address|center|table|thead|tbody|tfoot|tr|th|td)>)\s*/ig, '$1\n');
+        return data.strip();
+    }
     this.escapeEntities = function(xml) {
         // XXX: temporarily disabled
         return xml;

Modified: zope-kupu/trunk/common/kupuhelpers.js
===================================================================
--- zope-kupu/trunk/common/kupuhelpers.js	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/common/kupuhelpers.js	2007-02-09 14:51:51 UTC (rev 666)
@@ -8,7 +8,7 @@
  *
  *****************************************************************************/
 
-// $Id: kupuhelpers.js 30984 2006-08-04 11:12:10Z duncan $
+// $Id: kupuhelpers.js 31003 2006-08-04 14:19:13Z duncan $
 
 /*
 

Modified: zope-kupu/trunk/common/kupusaveonpart.js
===================================================================
--- zope-kupu/trunk/common/kupusaveonpart.js	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/common/kupusaveonpart.js	2007-02-09 14:51:51 UTC (rev 666)
@@ -8,7 +8,7 @@
  *
  *****************************************************************************/
 
-// $Id: kupusaveonpart.js 25040 2006-03-27 14:49:21Z fschulze $
+// $Id: kupusaveonpart.js 22453 2006-01-19 16:40:56Z guido $
 
 function saveOnPart() {
     /* ask the user if (s)he wants to save the document before leaving */

Modified: zope-kupu/trunk/common/kupusourceedit.js
===================================================================
--- zope-kupu/trunk/common/kupusourceedit.js	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/common/kupusourceedit.js	2007-02-09 14:51:51 UTC (rev 666)
@@ -75,7 +75,7 @@
         } else {
             data = kupu.getHTMLBody();
         };
-        sourcearea.value = data;
+        sourcearea.value = data.strip();
         kupu.setClass(sourceClass);
         editorframe.style.display = 'none';
         sourcearea.style.display = 'block';

Modified: zope-kupu/trunk/common/sarissa.js
===================================================================
--- zope-kupu/trunk/common/sarissa.js	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/common/sarissa.js	2007-02-09 14:51:51 UTC (rev 666)
@@ -68,13 +68,15 @@
     // used to store the most recent ProgID available out of the above
     var _SARISSA_DOM_PROGID = "";
     var _SARISSA_XMLHTTP_PROGID = "";
+    var _SARISSA_THREADEDDOM_PROGID = "";
+    var _SARISSA_XSLTEMPLATE_PROGID = "";
     /**
      * Called when the Sarissa_xx.js file is parsed, to pick most recent
      * ProgIDs for IE, then gets destroyed.
      * @param idList an array of MSXML PROGIDs from which the most recent will be picked for a given object
      * @param enabledList an array of arrays where each array has two items; the index of the PROGID for which a certain feature is enabled
      */
-    pickRecentProgID = function (idList, enabledList){
+    Sarissa.pickRecentProgID = function (idList, enabledList){
         // found progID flag
         var bFound = false;
         for(var i=0; i < idList.length && !bFound; i++){
@@ -94,18 +96,14 @@
         idList = null;
         return o2Store;
     };
-    // pick best available MSXML progIDs
-    _SARISSA_DOM_PROGID = pickRecentProgID(["Msxml2.DOMDocument.5.0", "Msxml2.DOMDocument.4.0", "Msxml2.DOMDocument.3.0", "MSXML2.DOMDocument", "MSXML.DOMDocument", "Microsoft.XMLDOM"], [["SELECT_NODES", 2],["TRANSFORM_NODE", 2]]);
-    _SARISSA_XMLHTTP_PROGID = pickRecentProgID(["Msxml2.XMLHTTP.5.0", "Msxml2.XMLHTTP.4.0", "MSXML2.XMLHTTP.3.0", "MSXML2.XMLHTTP", "Microsoft.XMLHTTP"], [["XMLHTTP", 4]]);
-    _SARISSA_THREADEDDOM_PROGID = pickRecentProgID(["Msxml2.FreeThreadedDOMDocument.5.0", "MSXML2.FreeThreadedDOMDocument.4.0", "MSXML2.FreeThreadedDOMDocument.3.0"]);
-    _SARISSA_XSLTEMPLATE_PROGID = pickRecentProgID(["Msxml2.XSLTemplate.5.0", "Msxml2.XSLTemplate.4.0", "MSXML2.XSLTemplate.3.0"], [["XSLTPROC", 2]]);
-    // we dont need this anymore
-    pickRecentProgID = null;
     //============================================
     // Factory methods (IE)
     //============================================
     // see non-IE version
     Sarissa.getDomDocument = function(sUri, sName){
+        if (!_SARISSA_DOM_PROGID) {
+            _SARISSA_DOM_PROGID = Sarissa.pickRecentProgID(["Msxml2.DOMDocument.4.0", "Msxml2.DOMDocument.3.0", "MSXML2.DOMDocument", "MSXML.DOMDocument", "Microsoft.XMLDOM"], [["SELECT_NODES", 2],["TRANSFORM_NODE", 2]]);
+        };
         var oDoc = new ActiveXObject(_SARISSA_DOM_PROGID);
         // if a root tag name was provided, we need to load it in the DOM
         // object
@@ -150,6 +148,9 @@
      * @constructor
      */
     XSLTProcessor = function(){
+        if (!_SARISSA_XSLTEMPLATE_PROGID) {
+            _SARISSA_XSLTEMPLATE_PROGID = Sarissa.pickRecentProgID(["Msxml2.XSLTemplate.4.0", "MSXML2.XSLTemplate.3.0"], [["XSLTPROC", 2]]);
+        };
         this.template = new ActiveXObject(_SARISSA_XSLTEMPLATE_PROGID);
         this.processor = null;
     };
@@ -159,6 +160,9 @@
      */
     XSLTProcessor.prototype.importStylesheet = function(xslDoc){
         // convert stylesheet to free threaded
+        if (!_SARISSA_THREADEDDOM_PROGID) {
+            _SARISSA_THREADEDDOM_PROGID = Sarissa.pickRecentProgID(["MSXML2.FreeThreadedDOMDocument.4.0", "MSXML2.FreeThreadedDOMDocument.3.0"]);
+        }
         var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); 
         converted.loadXML(xslDoc.xml);
         this.template.stylesheet = converted;
@@ -368,17 +372,19 @@
     
 };
 
-if(window.XMLHttpRequest){
-    Sarissa.IS_ENABLED_XMLHTTP = true;
-}
-else if(_SARISSA_IS_IE){
+if (!window.XMLHttpRequest && window.ActiveXObject) {
     /**
      * Emulate XMLHttpRequest
      * @constructor
      */
     XMLHttpRequest = function() {
+        if(!_SARISSA_XMLHTTP_PROGID){
+            _SARISSA_XMLHTTP_PROGID = Sarissa.pickRecentProgID(["Msxml2.XMLHTTP.4.0", "MSXML2.XMLHTTP.3.0", "MSXML2.XMLHTTP", "Microsoft.XMLHTTP"]);
+        };
         return new ActiveXObject(_SARISSA_XMLHTTP_PROGID);
     };
+}
+if(window.XMLHttpRequest){
     Sarissa.IS_ENABLED_XMLHTTP = true;
 };
 
@@ -507,7 +513,7 @@
     };
     var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument;
     var nodes = nodeFrom.childNodes;
-    if(ownerDoc.importNode && (!_SARISSA_IS_IE)) {
+    if(ownerDoc.importNode) {
         for(var i=0;i < nodes.length;i++) {
             nodeTo.appendChild(ownerDoc.importNode(nodes[i], true));
         };

Modified: zope-kupu/trunk/debian/changelog
===================================================================
--- zope-kupu/trunk/debian/changelog	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/debian/changelog	2007-02-09 14:51:51 UTC (rev 666)
@@ -1,3 +1,9 @@
+zope-kupu (1.3.9-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Fri,  9 Feb 2007 15:51:38 +0100
+
 zope-kupu (1.3.8-1) unstable; urgency=low
 
   * New upstream release.

Modified: zope-kupu/trunk/default/drawers.kupu
===================================================================
--- zope-kupu/trunk/default/drawers.kupu	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/default/drawers.kupu	2007-02-09 14:51:51 UTC (rev 666)
@@ -7,7 +7,7 @@
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
     i18n:domain="kupu"
     >
-  <kupu:id>$Id: drawers.kupu 25249 2006-04-03 12:22:25Z fschulze $</kupu:id>
+  <kupu:id>$Id: drawers.kupu 25716 2006-04-12 10:07:19Z fschulze $</kupu:id>
 
   <kupu:part name="styles">
     <link href="kupudrawerstyles.css" rel="stylesheet" type="text/css" />

Modified: zope-kupu/trunk/default/sourceedit.kupu
===================================================================
--- zope-kupu/trunk/default/sourceedit.kupu	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/default/sourceedit.kupu	2007-02-09 14:51:51 UTC (rev 666)
@@ -7,7 +7,7 @@
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
     i18n:domain="kupu"
     >
-  <kupu:id>$Id: sourceedit.kupu 25249 2006-04-03 12:22:25Z fschulze $</kupu:id>
+  <kupu:id>$Id: sourceedit.kupu 25716 2006-04-12 10:07:19Z fschulze $</kupu:id>
 <!--
 This feature provides Source Editing functionality. Source editing is
 enabled by clicking on a button (provided in the 'button' part) which

Modified: zope-kupu/trunk/default/toolbar.kupu
===================================================================
--- zope-kupu/trunk/default/toolbar.kupu	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/default/toolbar.kupu	2007-02-09 14:51:51 UTC (rev 666)
@@ -7,7 +7,7 @@
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
     i18n:domain="kupu"
     >
-  <kupu:id>$Id: toolbar.kupu 31005 2006-08-04 14:29:57Z duncan $</kupu:id>
+  <kupu:id>$Id: toolbar.kupu 34310 2006-11-07 10:21:58Z duncan $</kupu:id>
 
   <kupu:part name="toolbar">
     <div class="kupu-tb" id="toolbar">
@@ -52,7 +52,7 @@
 
   <kupu:part name="logo">
     <span class="kupu-tb-buttongroup kupu-logo" style="float: right" id="kupu-logo">
-      <button type="button" class="kupu-logo" title="Kupu 1.3.8" 
+      <button type="button" class="kupu-logo" title="Kupu 1.3.9" 
               i18n:attributes="title" accesskey="k"
               onclick="window.open('http://kupu.oscom.org');">&#160;</button>
     </span>

Modified: zope-kupu/trunk/doc/CHANGES.txt
===================================================================
--- zope-kupu/trunk/doc/CHANGES.txt	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/doc/CHANGES.txt	2007-02-09 14:51:51 UTC (rev 666)
@@ -2,6 +2,13 @@
 Kupu changes
 ============
 
+- 1.3.9
+
+  - Fixes for IE7 compatability.
+
+  - Fixed the duplicate resources bug (so resources won't be duplicated 
+    on reinstall any more).
+
 - 1.3.8
 
   - HTML view now does filtering by default in Plone (can be turned

Modified: zope-kupu/trunk/plone/__init__.py
===================================================================
--- zope-kupu/trunk/plone/__init__.py	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/plone/__init__.py	2007-02-09 14:51:51 UTC (rev 666)
@@ -13,7 +13,7 @@
 layer containing the necessary UI customization to integrate Kupu as a
 wysiwyg editor in Plone.
 
-$Id: __init__.py 25043 2006-03-27 15:29:40Z fschulze $
+$Id: __init__.py 25115 2006-03-29 15:13:39Z fschulze $
 """
 from App.Common import package_home
 from Products.CMFCore.DirectoryView import registerDirectory

Modified: zope-kupu/trunk/plone/body.kupu
===================================================================
--- zope-kupu/trunk/plone/body.kupu	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/plone/body.kupu	2007-02-09 14:51:51 UTC (rev 666)
@@ -5,8 +5,9 @@
     xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
     xmlns:tal="http://xml.zope.org/namespaces/tal"
     xmlns:i18n="http://xml.zope.org/namespaces/i18n">
-  <kupu:id>$Id: body.kupu 30991 2006-08-04 12:04:31Z duncan $</kupu:id>
+  <kupu:id>$Id: body.kupu 34308 2006-11-07 10:10:48Z duncan $</kupu:id>
   <kupu:part name="editorframe"><script type="text/javascript">var focuscount = 0;</script>
+    <div>
     <iframe class="kupu-editor-iframe"
         frameborder="0"
         src="emptypage"
@@ -63,6 +64,7 @@
                         rows rows|default;
                         cols cols|default;">
     </textarea>
+   </div>
   </kupu:part>
 
   <kupu:part name="suppress-kupu">

Modified: zope-kupu/trunk/plone/drawers.kupu
===================================================================
--- zope-kupu/trunk/plone/drawers.kupu	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/plone/drawers.kupu	2007-02-09 14:51:51 UTC (rev 666)
@@ -6,7 +6,7 @@
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
     xmlns:tal="http://xml.zope.org/namespaces/tal"
     >
-    <kupu:id>$Id: drawers.kupu 14546 2005-07-12 14:35:55Z duncan $</kupu:id>
+    <kupu:id>$Id: drawers.kupu 25115 2006-03-29 15:13:39Z fschulze $</kupu:id>
 
   <kupu:part name="styles">
   </kupu:part>

Modified: zope-kupu/trunk/plone/head.kupu
===================================================================
--- zope-kupu/trunk/plone/head.kupu	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/plone/head.kupu	2007-02-09 14:51:51 UTC (rev 666)
@@ -6,7 +6,7 @@
     xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
     xmlns:tal="http://xml.zope.org/namespaces/tal"
     >
-    <kupu:id>$Id: head.kupu 25040 2006-03-27 14:49:21Z fschulze $</kupu:id>
+    <kupu:id>$Id: head.kupu 21720 2006-01-05 15:59:25Z paul $</kupu:id>
 
   <kupu:part name="styles">
    <tal:test condition="not:exists:portal/portal_css">

Modified: zope-kupu/trunk/plone/html2captioned.py
===================================================================
--- zope-kupu/trunk/plone/html2captioned.py	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/plone/html2captioned.py	2007-02-09 14:51:51 UTC (rev 666)
@@ -52,7 +52,7 @@
 </div>
 '''
 
-UID_PATTERN = re.compile('(?P<tag><(?:a|img) [^>]*(?:src|href)=")(?P<url>[^"]*resolveuid/(?P<uid>[^"#? ]*))')
+UID_PATTERN = re.compile('(?P<tag><(?:a|img) [^>]*(?:src|href)=")(?P<url>[^"]*resolveuid/(?P<uid>[^/"#? ]*))')
 
 class HTMLToCaptioned:
     """Transform which adds captions to images embedded in HTML"""

Modified: zope-kupu/trunk/plone/kupu_plone_layer/kupuploneinit.js
===================================================================
--- zope-kupu/trunk/plone/kupu_plone_layer/kupuploneinit.js	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/plone/kupu_plone_layer/kupuploneinit.js	2007-02-09 14:51:51 UTC (rev 666)
@@ -8,7 +8,7 @@
  *
  *****************************************************************************/
 
-// $Id: kupuploneinit.js 27127 2006-05-12 12:14:12Z duncan $
+// $Id: kupuploneinit.js 27125 2006-05-12 11:00:37Z duncan $
 
 function initPloneKupu(editorId) {
     var topnode = getFromSelector(editorId);

Modified: zope-kupu/trunk/plone/librarytool.py
===================================================================
--- zope-kupu/trunk/plone/librarytool.py	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/plone/librarytool.py	2007-02-09 14:51:51 UTC (rev 666)
@@ -11,7 +11,7 @@
 
 This module contains Kupu's library tool to support drawers.
 
-$Id: librarytool.py 25040 2006-03-27 14:49:21Z fschulze $
+$Id: librarytool.py 21720 2006-01-05 15:59:25Z paul $
 """
 import Acquisition
 from Acquisition import aq_parent, aq_inner, aq_base

Modified: zope-kupu/trunk/plone/plonelibrarytool.py
===================================================================
--- zope-kupu/trunk/plone/plonelibrarytool.py	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/plone/plonelibrarytool.py	2007-02-09 14:51:51 UTC (rev 666)
@@ -12,7 +12,7 @@
 This module contains the Plone specific version of the Kupu library
 tool.
 
-$Id: plonelibrarytool.py 30989 2006-08-04 11:59:18Z duncan $
+$Id: plonelibrarytool.py 34309 2006-11-07 10:19:31Z duncan $
 """
 import os
 from ZODB.PersistentList import PersistentList
@@ -104,9 +104,10 @@
         # We load default values here, so __init__ can still be used
         # in unit tests. Plus, it only makes sense to load these if
         # we're being added to a Plone site anyway
-        for lib in _default_libraries:
-            self.addLibrary(**lib)
-        self._res_types.update(_default_resource_types)
+        if not len(self._libraries):
+            for lib in _default_libraries:
+                self.addLibrary(**lib)
+            self._res_types.update(_default_resource_types)
 
     security.declareProtected('View', "getLinkbyuid")
     def getLinkbyuid(self):

Modified: zope-kupu/trunk/plone/toolbar.kupu
===================================================================
--- zope-kupu/trunk/plone/toolbar.kupu	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/plone/toolbar.kupu	2007-02-09 14:51:51 UTC (rev 666)
@@ -6,7 +6,7 @@
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
     xmlns:tal="http://xml.zope.org/namespaces/tal"
     >
-<kupu:id>$Id: toolbar.kupu 25249 2006-04-03 12:22:25Z fschulze $</kupu:id>
+<kupu:id>$Id: toolbar.kupu 25716 2006-04-12 10:07:19Z fschulze $</kupu:id>
 
   <kupu:part name="logo">
   </kupu:part>

Modified: zope-kupu/trunk/plone/wire.kupu
===================================================================
--- zope-kupu/trunk/plone/wire.kupu	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/plone/wire.kupu	2007-02-09 14:51:51 UTC (rev 666)
@@ -2,7 +2,7 @@
   implementation="plone"
   xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
   >
-  <kupu:id>$Id: wire.kupu 23401 2006-02-16 13:47:33Z limi $</kupu:id>
+  <kupu:id>$Id: wire.kupu 25115 2006-03-29 15:13:39Z fschulze $</kupu:id>
 
   <!-- Plone specific wiring -->
 

Modified: zope-kupu/trunk/plone/wysiwyg_support.kupu
===================================================================
--- zope-kupu/trunk/plone/wysiwyg_support.kupu	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/plone/wysiwyg_support.kupu	2007-02-09 14:51:51 UTC (rev 666)
@@ -7,7 +7,7 @@
     xmlns:metal="http://xml.zope.org/namespaces/metal"
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
     >
-  <kupu:id>$Id: wysiwyg_support.kupu 27713 2006-05-26 10:32:29Z duncan $</kupu:id>
+  <kupu:id>$Id: wysiwyg_support.kupu 27715 2006-05-26 10:35:22Z duncan $</kupu:id>
 
   <kupu:part name="editorbox">
 

Modified: zope-kupu/trunk/plone/xmlconfig.kupu
===================================================================
--- zope-kupu/trunk/plone/xmlconfig.kupu	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/plone/xmlconfig.kupu	2007-02-09 14:51:51 UTC (rev 666)
@@ -8,7 +8,7 @@
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
     i18n:domain="kupu"
     >
-  <kupu:id>$Id: xmlconfig.kupu 30986 2006-08-04 11:38:46Z duncan $</kupu:id>
+  <kupu:id>$Id: xmlconfig.kupu 31003 2006-08-04 14:19:13Z duncan $</kupu:id>
 
   <!-- Default configuration -->
   <kupu:part name="defaultconfig">

Modified: zope-kupu/trunk/silva/kupusilvainit.js
===================================================================
--- zope-kupu/trunk/silva/kupusilvainit.js	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/silva/kupusilvainit.js	2007-02-09 14:51:51 UTC (rev 666)
@@ -8,7 +8,7 @@
  *
  *****************************************************************************/
 
-// $Id: kupusilvainit.js 25040 2006-03-27 14:49:21Z fschulze $
+// $Id: kupusilvainit.js 22576 2006-01-24 10:23:04Z guido $
 
 // XXX Port this to the default dist?
 KupuEditor.prototype.afterInit = function() {

Modified: zope-kupu/trunk/silva/kupusilvatools.js
===================================================================
--- zope-kupu/trunk/silva/kupusilvatools.js	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/silva/kupusilvatools.js	2007-02-09 14:51:51 UTC (rev 666)
@@ -8,7 +8,7 @@
  *
  *****************************************************************************/
 
-// $Id: kupusilvatools.js 25715 2006-04-12 10:03:02Z fschulze $
+// $Id: kupusilvatools.js 25183 2006-03-31 12:51:39Z guido $
 
 // a mapping from namespace to field names, here you can configure which 
 // metadata fields should be editable with the property editor (needs to

Modified: zope-kupu/trunk/tests/test_plone.js
===================================================================
--- zope-kupu/trunk/tests/test_plone.js	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/tests/test_plone.js	2007-02-09 14:51:51 UTC (rev 666)
@@ -8,7 +8,7 @@
  *
  *****************************************************************************/
 
-// $Id: test_plone.js 25114 2006-03-29 15:13:02Z fschulze $
+// $Id: test_plone.js 25115 2006-03-29 15:13:39Z fschulze $
 
 // Various tests for html -> xhtml processing.
 

Modified: zope-kupu/trunk/version.txt
===================================================================
--- zope-kupu/trunk/version.txt	2007-02-09 14:51:12 UTC (rev 665)
+++ zope-kupu/trunk/version.txt	2007-02-09 14:51:51 UTC (rev 666)
@@ -1 +1 @@
-kupu 1.3.8
+kupu 1.3.9

More information about the pkg-zope-commits mailing list