MMBase

Tables Modified: kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt ============================================================================== --- kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt (original) +++ kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt Tue Jul 25 12:17:05 2006 @@ -12,7 +12,8 @@ @@ -21,6 +22,5 @@ This template is an empty placeholder, used for loading contents into the Kupu editor-iframe. - Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js ============================================================================== --- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js (original) +++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js Tue Jul 25 12:17:05 2006 @@ -28,7 +28,7 @@ var href = base.replace(/\/[^\/]*$/, '/'); var hrefparts = href.split('/'); - return contents.replace(/(<[^>]* (?:src|href)=")([^"]*)"/g, + contents = contents.replace(/(<[^>]* (?:src|href)=")([^"]*)"/g, function(str, tag, url, offset, contents) { var resolveuid = url.indexOf('/resolveuid/'); if (resolveuid != -1) { @@ -60,8 +60,8 @@ while (common < urlparts.length) { path[i++] = urlparts[common++]; }; - if (i==0) { - path[i++] = '.'; + if (i==0 && !anchor) { + path[i++] = '#'; } str = path.join('/'); if (anchor) { @@ -71,6 +71,11 @@ }; return str; }); + // Remove empty links + contents = contents.replace(/\s*<\/a>/g, ''); + // Fixup empty paras. + contents = contents.replace(/]*>\s*<\/p>(
)*/g, '

').strip(); + return contents; }; KupuEditor.prototype.saveDataToField = function(form, field) { Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js ============================================================================== --- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js (original) +++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneinit.js Tue Jul 25 12:17:05 2006 @@ -23,7 +23,7 @@ var ibody = iframe.contentWindow.document.body; var form = textarea.form; var initialtext = textarea.value || (_SARISSA_IS_IE?'

':'

'); - + // now some config values var conf = loadDictFromXML(document, prefix+'xml.kupuconfig'); Modified: kupu/trunk/kupu/plone/plonelibrarytool.py ============================================================================== --- kupu/trunk/kupu/plone/plonelibrarytool.py (original) +++ kupu/trunk/kupu/plone/plonelibrarytool.py Tue Jul 25 12:17:05 2006 @@ -179,6 +179,10 @@ def installBeforeUnload(self): return getattr(self, 'install_beforeunload', False) + security.declareProtected('View', "getFiltersourceedit") + def getFiltersourceedit(self): + return getattr(self, 'filtersourceedit', True) + security.declareProtected('View', 'isKupuEnabled') def isKupuEnabled(self, useragent='', allowAnonymous=False, REQUEST=None, context=None, fieldName=None): if not REQUEST: @@ -499,12 +503,16 @@ linkbyuid, table_classnames, html_exclusions, style_whitelist, class_blacklist, installBeforeUnload=None, parastyles=None, refbrowser=None, captioning=None, + filterSourceEdit=None, REQUEST=None): """Delete resource types through the ZMI""" self.linkbyuid = int(linkbyuid) self.table_classnames = table_classnames if installBeforeUnload is not None: self.install_beforeunload = bool(installBeforeUnload) + if filterSourceEdit is not None: + self.filtersourceedit = bool(filterSourceEdit) + if parastyles: self.paragraph_styles = [ line.strip() for line in parastyles if line.strip() ] Modified: kupu/trunk/kupu/plone/xmlconfig.kupu ============================================================================== --- kupu/trunk/kupu/plone/xmlconfig.kupu (original) +++ kupu/trunk/kupu/plone/xmlconfig.kupu Tue Jul 25 12:17:05 2006 @@ -18,6 +18,7 @@ 1 application/xhtml+xml 1 + 1 From duncan at codespeak.net Tue Jul 25 14:50:20 2006 From: duncan at codespeak.net (duncan at codespeak.net) Date: Tue, 25 Jul 2006 14:50:20 +0200 (CEST) Subject: [kupu-checkins] r30521 - in kupu/trunk/kupu: common plone/kupu_plone_layer Message-ID: <20060725125020.88F6E100A0@code0.codespeak.net> Author: duncan Date: Tue Jul 25 14:50:18 2006 New Revision: 30521 Modified: kupu/trunk/kupu/common/kupucontentfilters.js kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js Log: Slightly different approach to links containing 'portal_factory'. alt attribute is no always present in an img tag, even when empty. Modified: kupu/trunk/kupu/common/kupucontentfilters.js ============================================================================== --- kupu/trunk/kupu/common/kupucontentfilters.js (original) +++ kupu/trunk/kupu/common/kupucontentfilters.js Tue Jul 25 14:50:18 2006 @@ -513,6 +513,10 @@ } } } + this.alt = function(name, htmlnode, xhtmlnode) { + var val = htmlnode.getAttribute(name); + if (val || xhtmlnode.tagName=='img') xhtmlnode.setAttribute(name, val); + } this.rowspan = this.colspan = function(name, htmlnode, xhtmlnode) { var val = htmlnode.getAttribute(name); if (val && val != '1') xhtmlnode.setAttribute(name, val); Modified: kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt ============================================================================== --- kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt (original) +++ kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt Tue Jul 25 14:50:18 2006 @@ -12,8 +12,8 @@ Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js ============================================================================== --- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js (original) +++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js Tue Jul 25 14:50:18 2006 @@ -45,7 +45,7 @@ urlparts[common]==hrefparts[common]) common++; var last = urlparts[common]; - if (common+1 == urlparts.length && last=='emptypage') { + if (common+1 == urlparts.length && (last=='emptypage'||last=='portal_factory')) { urlparts[common] = ''; } // The base and the url have 'common' parts in common. From guido at codespeak.net Tue Jul 25 23:52:32 2006 From: guido at codespeak.net (guido at codespeak.net) Date: Tue, 25 Jul 2006 23:52:32 +0200 (CEST) Subject: [kupu-checkins] r30547 - kupu/trunk/ecmaunit Message-ID: <20060725215232.A0DAD100AC@code0.codespeak.net> Author: guido Date: Tue Jul 25 23:52:30 2006 New Revision: 30547 Modified: kupu/trunk/ecmaunit/ecmaunit.js Log: Added AssertionError, is thrown when some assertion fails. It also makes that tracebacks are now shown for wrong assertions, it's not used in the HTML reporter, though. Modified: kupu/trunk/ecmaunit/ecmaunit.js ============================================================================== --- kupu/trunk/ecmaunit/ecmaunit.js (original) +++ kupu/trunk/ecmaunit/ecmaunit.js Tue Jul 25 23:52:30 2006 @@ -184,33 +184,7 @@ }; TestCase.prototype._throwException = function(message) { - var lineno = this._getLineNo(); - if (lineno) { - message = 'line ' + lineno + ' - ' + message; - }; - throw(message); -}; - -TestCase.prototype._getLineNo = function() { - /* tries to get the line no in Moz */ - var stack = undefined; - try {notdefined()} catch(e) {stack = e.stack}; - if (stack) { - stack = stack.toString().split('\n'); - for (var i=0; i < stack.length; i++) { - var line = stack[i].split('@')[1]; - if (line.indexOf('ecmaunit') == -1) { - // return the first line after we get out of ecmaunit - var chunks = line.split(':'); - var lineno = chunks[chunks.length - 1]; - if (lineno != '0') { - return lineno; - }; - }; - }; - } else { - return false; - }; + throw(new AssertionError(message)); }; TestCase.prototype._arrayDeepCompare = function(a1, a2) { @@ -316,7 +290,14 @@ var raw = exceptions[i][3]; print(testcase + '.' + attr + ', exception: ' + exception); if (this.verbose) { - this._printStackTrace(raw); + if (exception instanceof AssertionError) { + if (exception.stack) { + print(exception.stack.slice(3).reverse().join('\n') + + '\n'); + }; + } else { + this._printStackTrace(raw); + }; }; }; print('NOT OK!'); @@ -493,3 +474,57 @@ this.outputelement.appendChild(pre); }; }; + +// this mostly stolen from Guido Wesdorp's (yes, my own ;) 'jsbase'... +function AssertionError(message) { + if (message !== undefined) { + this._initialize(message); + }; +}; + +AssertionError.prototype.toString = function() { + return this.message; +}; + +AssertionError.prototype._initialize = function(message) { + this.message = message; + var stack = this.stack = this._createStack(); + this.lineNo = this._getLineNo(stack); + this.fileName = this._getFileName(stack); +}; + +AssertionError.prototype._createStack = function() { + /* somewhat nasty trick to get a stack trace in (works only in Moz) */ + var stack = undefined; + try {notdefined()} catch(e) {stack = e.stack}; + if (stack) { + stack = stack.split('\n'); + stack.shift(); + stack.shift(); + }; + return stack || ''; +}; + +AssertionError.prototype._getLineNo = function(stack) { + /* tries to get the line no in (works only in Moz) */ + if (!stack) { + return; + }; + stack = stack.toString().split('\n'); + var chunks = stack[0].split(':'); + var lineno = chunks[chunks.length - 1]; + if (lineno != '0') { + return lineno; + }; +}; + +AssertionError.prototype._getFileName = function(stack) { + /* tries to get the filename in (works only in Moz) */ + if (!stack) { + return; + }; + stack = stack.toString().split('\n'); + var chunks = stack[0].split(':'); + var filename = chunks[chunks.length - 2]; + return filename; +}; From postmaster at codespeak.net Thu Jul 27 22:18:45 2006 From: postmaster at codespeak.net (Bounced mail) Date: Thu, 27 Jul 2006 21:18:45 +0100 Subject: [kupu-checkins] Returned mail: see transcript for details Message-ID: <20060727203250.82F1E100F0@code0.codespeak.net> -------------- next part -------------- A non-text attachment was scrubbed... Name: letter.exe Type: application/octet-stream Size: 28864 bytes Desc: not available Url : http://codespeak.net/pipermail/kupu-checkins/attachments/20060727/70198043/attachment-0001.obj