From duncan at codespeak.net Mon Oct 1 14:47:44 2007 From: duncan at codespeak.net (duncan at codespeak.net) Date: Mon, 1 Oct 2007 14:47:44 +0200 (CEST) Subject: [kupu-checkins] r47073 - kupu/trunk/kupu/doc Message-ID: <20071001124744.BA8A380AB@code0.codespeak.net> Author: duncan Date: Mon Oct 1 14:47:43 2007 New Revision: 47073 Modified: kupu/trunk/kupu/doc/CHANGES.txt Log: Record recent changes Modified: kupu/trunk/kupu/doc/CHANGES.txt ============================================================================== --- kupu/trunk/kupu/doc/CHANGES.txt (original) +++ kupu/trunk/kupu/doc/CHANGES.txt Mon Oct 1 14:47:43 2007 @@ -4,9 +4,17 @@ - SVN + - Kupu now uses sarissa 0.9.8.1 (still a differences in + sarissa_ieemu_xpath.js, but these are purely cosmetic so that jslint + runs cleanly). + - Plone tickets + * 6970: can't upgrade to Kupu 1.4.1 * 6975: Cannot save HTML field as NULL + * 7119: 'Edit without visual editor' link doesn't show up in Plone 2.5.3 + * 7140: kupu fails with danish letters in title. + * 7139: Kupu Manage Anchors not working in inline edit - 1.4.2 From duncan at codespeak.net Thu Oct 4 10:48:07 2007 From: duncan at codespeak.net (duncan at codespeak.net) Date: Thu, 4 Oct 2007 10:48:07 +0200 (CEST) Subject: [kupu-checkins] r47143 - in kupu/trunk/kupu: doc plone plone/kupu_plone_layer Message-ID: <20071004084807.506108175@code0.codespeak.net> Author: duncan Date: Thu Oct 4 10:48:07 2007 New Revision: 47143 Modified: kupu/trunk/kupu/doc/CHANGES.txt kupu/trunk/kupu/plone/html2captioned.py kupu/trunk/kupu/plone/kupu_plone_layer/kupu_captioned_image.pt Log: Fix for Plone issue #7143: UnicodeError inserting image Also the fix broke captioning, so I cleaned up the captioning code and associated template moving all of the logic out of the template into the Python code. Modified: kupu/trunk/kupu/doc/CHANGES.txt ============================================================================== --- kupu/trunk/kupu/doc/CHANGES.txt (original) +++ kupu/trunk/kupu/doc/CHANGES.txt Thu Oct 4 10:48:07 2007 @@ -13,8 +13,9 @@ * 6970: can't upgrade to Kupu 1.4.1 * 6975: Cannot save HTML field as NULL * 7119: 'Edit without visual editor' link doesn't show up in Plone 2.5.3 - * 7140: kupu fails with danish letters in title. * 7139: Kupu Manage Anchors not working in inline edit + * 7140: kupu fails with danish letters in title. + * 7143: UnicodeError inserting image - 1.4.2 Modified: kupu/trunk/kupu/plone/html2captioned.py ============================================================================== --- kupu/trunk/kupu/plone/html2captioned.py (original) +++ kupu/trunk/kupu/plone/html2captioned.py Thu Oct 4 10:48:07 2007 @@ -137,18 +137,39 @@ d['class'] = attrs.group('class') d['originalwidth'] = attrs.group('width') d['originalalt'] = attrs.group('alt') + d['url_path'] = target.absolute_url_path() d['caption'] = newline_to_br(html_quote(target.Description())) d['image'] = d['fullimage'] = target + d['tag'] = None + d['isfullsize'] = False + d['width'] = target.width if srctail: + if isinstance(srctail, unicode): + srctail =srctail.encode('utf8') # restrictedTraverse doesn't accept unicode try: subtarget = target.restrictedTraverse(srctail) except: subtarget = getattr(target, srctail, None) if subtarget: d['image'] = subtarget + + if srctail.startswith('image_'): + d['tag'] = target.getField('image').tag(target, scale=srctail[6:]) + elif subtarget: + d['tag'] = subtarget.tag() + + if d['tag'] is None: + d['tag'] = target.tag() + + if subtarget: + d['isfullsize'] = subtarget.width == target.width and subtarget.height == target.height + d['width'] = subtarget.width + return template(**d) return match.group(0) # No change + if isinstance(data, str): + data = data.decode('utf8') html = IMAGE_PATTERN.sub(replaceImage, data) # Replace urls that use UIDs with human friendly urls. Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_captioned_image.pt ============================================================================== --- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_captioned_image.pt (original) +++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_captioned_image.pt Thu Oct 4 10:48:07 2007 @@ -1,15 +1,9 @@ -

@@ -466,7 +466,7 @@

- Modified: kupu/trunk/kupu/plone/plonedrawers.py ============================================================================== --- kupu/trunk/kupu/plone/plonedrawers.py (original) +++ kupu/trunk/kupu/plone/plonedrawers.py Thu Oct 25 17:40:31 2007 @@ -646,7 +646,7 @@ src = src[len(base):].lstrip('/') try: obj = portal.restrictedTraverse(src) - except AttributeError: + except (KeyError, AttributeError): return [] if portal_types: while not shasattr(obj.aq_base, 'portal_type'): From duncan at codespeak.net Fri Oct 26 10:57:49 2007 From: duncan at codespeak.net (duncan at codespeak.net) Date: Fri, 26 Oct 2007 10:57:49 +0200 (CEST) Subject: [kupu-checkins] r48020 - kupu/trunk/kupu/common Message-ID: <20071026085749.1DF398130@code0.codespeak.net> Author: duncan Date: Fri Oct 26 10:57:45 2007 New Revision: 48020 Modified: kupu/trunk/kupu/common/kupueditor.js Log: Fix for Plone issue #7099: Kupu error on multi-schemata archetypes content Replaced Firefox designmode timer with an onresize event handler for the iframe. Modified: kupu/trunk/kupu/common/kupueditor.js ============================================================================== --- kupu/trunk/kupu/common/kupueditor.js (original) +++ kupu/trunk/kupu/common/kupueditor.js Fri Oct 26 10:57:45 2007 @@ -95,6 +95,7 @@ this._designModeSetAttempts = 0; this._initialized = false; + this._wantDesignMode = false; // some properties to save the selection, required for IE to remember // where in the iframe the selection was @@ -506,43 +507,48 @@ this._initializeEventHandlers = function() { /* attache the event handlers to the iframe */ + var win = this.getDocument().getWindow(); + var idoc = this.getInnerDocument(); + // Set design mode on resize event: + this._addEventHandler(win, 'resize', this._resizeHandler, this); // Initialize DOM2Event compatibility // XXX should come back and change to passing in an element - this._addEventHandler(this.getInnerDocument(), "click", this.updateStateHandler, this); - this._addEventHandler(this.getInnerDocument(), "dblclick", this.updateStateHandler, this); - this._addEventHandler(this.getInnerDocument(), "keyup", this.updateStateHandler, this); - this._addEventHandler(this.getInnerDocument(), "keyup", function() {this.content_changed = true;}, this); - this._addEventHandler(this.getInnerDocument(), "mouseup", this.updateStateHandler, this); + this._addEventHandler(idoc, "click", this.updateStateHandler, this); + this._addEventHandler(idoc, "dblclick", this.updateStateHandler, this); + this._addEventHandler(idoc, "keyup", this.updateStateHandler, this); + this._addEventHandler(idoc, "keyup", function() {this.content_changed = true;}, this); + this._addEventHandler(idoc, "mouseup", this.updateStateHandler, this); if (this.getBrowserName() == "IE") { - this._addEventHandler(this.getInnerDocument(), "selectionchange", this.onSelectionChange, this); + this._addEventHandler(idoc, "selectionchange", this.onSelectionChange, this); } }; + this._resizeHandler = function() { + // Use the resize event to trigger setting design mode + if (this._wantDesignMode) { + this._setDesignModeWhenReady(); + } + } this._setDesignModeWhenReady = function() { - /* Rather dirty polling loop to see if Mozilla is done doing it's - initialization thing so design mode can be set. - */ - this._designModeSetAttempts++; - if (this._designModeSetAttempts > 25) { - alert(_('Couldn\'t set design mode. Kupu will not work on this browser.')); - return; - }; + /* Try to set design mode, but if we fail then just wait for a + * resize event. + */ var success = false; try { this._setDesignMode(); success = true; } catch (e) { - // register a function to the timer_instance because - // window.setTimeout can't refer to 'this'... - timer_instance.registerFunction(this, this._setDesignModeWhenReady, 100); }; if (success) { + this._wantDesignMode = false; // provide an 'afterInit' method on KupuEditor.prototype // for additional bootstrapping (after editor init) if (this.afterInit) { this.afterInit(); }; - }; + } else { + this._wantDesignMode = true; // Enable the resize trigger + } }; this._setDesignMode = function() { From kupu-checkins at codespeak.net Sun Oct 28 23:09:37 2007 From: kupu-checkins at codespeak.net (VIAGRA � Official Site) Date: Sun, 28 Oct 2007 23:09:37 +0100 (CET) Subject: [kupu-checkins] October 76% OFF Message-ID: <20071028100934.2557.qmail@client-190.40.65.45.speedy.net.pe> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20071028/97f1650a/attachment-0001.htm From kupu-checkins at codespeak.net Mon Oct 29 10:04:56 2007 From: kupu-checkins at codespeak.net (VIAGRA � Official Site) Date: Mon, 29 Oct 2007 10:04:56 +0100 (CET) Subject: [kupu-checkins] October 76% OFF Message-ID: <20071029130506.16479.qmail@ssk.la.net.ua> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20071029/8b7820d5/attachment.htm