Debug Log

From duncan at codespeak.net Fri Sep 22 13:23:59 2006 From: duncan at codespeak.net (duncan at codespeak.net) Date: Fri, 22 Sep 2006 13:23:59 +0200 (CEST) Subject: [kupu-checkins] r32574 - in kupu/trunk/kupu: common doc plone plone/kupu_plone_layer plone/kupu_plone_layer/plonekupuimages Message-ID: <20060922112359.5B7151006C@code0.codespeak.net> Author: duncan Date: Fri Sep 22 13:23:55 2006 New Revision: 32574 Modified: kupu/trunk/kupu/common/kupuhelpers.js kupu/trunk/kupu/doc/PLONE2.txt kupu/trunk/kupu/plone/kupu_plone_layer/plonekupuimages/ (props changed) kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py kupu/trunk/kupu/plone/librarytool.py kupu/trunk/kupu/plone/plonedrawers.py kupu/trunk/kupu/plone/plonelibrarytool.py kupu/trunk/kupu/plone/resource_types.pt Log: Fix: Image drawer didn't close properly when inserting an image at the end of a line. Preview configuration now has more fields so images no longer have to use the target object's URL. See PLONE2.txt for a description. Modified: kupu/trunk/kupu/common/kupuhelpers.js ============================================================================== --- kupu/trunk/kupu/common/kupuhelpers.js (original) +++ kupu/trunk/kupu/common/kupuhelpers.js Fri Sep 22 13:23:55 2006 @@ -538,11 +538,11 @@ container.insertBefore(node, afterNode); } else { container.appendChild(node); + afterNode = container.nextSibling; }; } - - range.setEnd(afterNode, 0); - range.setStart(afterNode, 0); + range.setEndAfter(node); + range.collapse(false); } if (selectAfterPlace) { Modified: kupu/trunk/kupu/doc/PLONE2.txt ============================================================================== --- kupu/trunk/kupu/doc/PLONE2.txt (original) +++ kupu/trunk/kupu/doc/PLONE2.txt Fri Sep 22 13:23:55 2006 @@ -293,6 +293,28 @@ be the name of an Archetypes field (in the form 'portal type.field name'). See `Reference Browser`_. +Action urls +~~~~~~~~~~~ + +For any type (but mostly images) you may specify expressions to be +used for the preview in the drawer properties panel, the url to be +inserted for a normal image, and the field to be used to determine +image scales. The defaults are: + + preview + No preview shown by default. Set to + 'string:${object_url}/image_thumb' for an image preview. + object_url for the preview is the actual url of the object. + + normal image + Defaults to 'string:${object_url}'. object_url for the normal + url will be the resolveuid form if uids are being used, + otherwise the actual url. + + fieldname + Defaults to 'image'. N.B. This is a literal string, not a tal + expression. + documentation tab ================= @@ -485,17 +507,14 @@ attributes are recognised: allowed_types - Direct equivalent of Kupu's own resource types. Lists permitted types for the drawer. allowed_types_method - The name of a method on the object which can be called to return the list of types. base_query - Either a dictionary, or the name of a method which returns a dictionary. This dictionary contains search parameters used by libraries. Modified: kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py ============================================================================== --- kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py (original) +++ kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py Fri Sep 22 13:23:55 2006 @@ -93,9 +93,16 @@ # this picks the wrong preview URL, you might want to change these # expressions. PREVIEW_EXPR = 'string:${object_url}/%s' -PREVIEW = [ { 'portal_type': type, 'expression': PREVIEW_EXPR % image } +PREVIEW = [ { 'portal_type': type, + 'expression': PREVIEW_EXPR % image, + 'normal': None, + 'scalefield': image.split('_',1)[0], + } for (type, image) in tool.getPreviewable() ] -# e.g. PREVIEW=[{'portal_type': 'Image', 'expression':'string:${object_url}/image_thumb'}] +# e.g. PREVIEW=[{'portal_type': 'Image', +# 'expression':'string:${object_url}/image_thumb' +# 'normal': 'string:$object_url', +# 'scalefield': 'image' }] for p in PREVIEW: print p['portal_type'], p['expression'] Modified: kupu/trunk/kupu/plone/librarytool.py ============================================================================== --- kupu/trunk/kupu/plone/librarytool.py (original) +++ kupu/trunk/kupu/plone/librarytool.py Fri Sep 22 13:23:55 2006 @@ -167,15 +167,22 @@ type_map[resource_type] = tuple(portal_types) def updatePreviewActions(self, preview_actions): + """Now a misnomer: actually updates preview, normal, and scaling data""" action_map = {} for a in preview_actions: portal_type = a.get('portal_type', '') - expr = a.get('expression', '') + preview = a.get('expression', '') + normal = a.get('normal', None) + if normal: + normal = Expression(normal) + scalefield = a.get('scalefield', 'image') if not portal_type: continue - action_map[portal_type] = { 'expression': Expression(expr), } - + action_map[portal_type] = { + 'expression': Expression(preview), + 'normal': normal, + 'scalefield': scalefield, } self._preview_actions = action_map def deleteResourceTypes(self, resource_types): @@ -206,3 +213,17 @@ return expr(context) return None + def getNormalUrl(self, portal_type, url): + action_map = getattr(self, '_preview_actions', {}) + if portal_type in action_map: + expr = action_map[portal_type]['normal'] + if expr: + data = { + 'object_url': url, + 'portal_type': portal_type, + 'modules': SecureModuleImporter, + } + context = getEngine().getContext(data) + return expr(context) + return url + Modified: kupu/trunk/kupu/plone/plonedrawers.py ============================================================================== --- kupu/trunk/kupu/plone/plonedrawers.py (original) +++ kupu/trunk/kupu/plone/plonedrawers.py Fri Sep 22 13:23:55 2006 @@ -160,14 +160,14 @@ self.anchor_types = tool.getResourceType('containsanchors').portal_types self.portal_base = self.url_tool.getPortalPath() self.prefix_length = len(self.portal_base)+1 - self.resource_type = tool.getResourceType(resource_type) + self.resource_type = resource_type instance = tool.REQUEST.get('instance', '') if instance: instance = 'instance=%s&' % tool.REQUEST.instance self.srctail = 'kupucollection.xml?'+instance+'resource_type=' + resource_type.name - self.showimagesize = resource_type=='mediaobject' + self.showimagesize = resource_type.name=='mediaobject' # The redirecting url must be absolute otherwise it won't work for # preview when the page is using portal_factory @@ -219,6 +219,7 @@ cache_key = (get_ident(), self.portal_base, portal_type) if not IMAGE_SIZES_CACHE.has_key(cache_key): IMAGE_SIZES_CACHE[cache_key] = {} + imagefield = self.tool.getScaleFieldForType(portal_type) # if getId is not callable, we assume that we have a brain and # need to get the object if not callable(obj.getId): @@ -227,21 +228,21 @@ obj = obj.getObject() if getattr(obj, 'getField', None) is None: return - image_field = obj.getWrappedField('image') + image_field = obj.getWrappedField(imagefield) if image_field is None: return if getattr(image_field, 'getAvailableSizes', None) is None: return image_sizes = image_field.getAvailableSizes(obj) - sizes = [((v[0], v[1]), k) for k,v in image_sizes.items()] + sizes = [(v[0], v[1], k, '%s_%s' % (imagefield,k)) for k,v in image_sizes.items()] sizes.sort() IMAGE_SIZES_CACHE[cache_key] = sizes else: sizes = IMAGE_SIZES_CACHE[cache_key] results = [] - for size, key in sizes: - results.append({'label':"%s (%s, %s)" % (key.capitalize(), size[0], size[1]), - 'uri':"%s/image_%s" % (url, key)}) + for width, height, key, action in sizes: + results.append({'label':"%s (%s, %s)" % (key.capitalize(), width, height), + 'uri':"%s/%s" % (url, action)}) return results def getState(self, review_state): @@ -276,8 +277,9 @@ portal_type = getattr(obj, 'portal_type','') collection = portal_type in self.coll_types + tool = self.tool url = obj.absolute_url() - preview = self.tool.getPreviewUrl(portal_type, url) + preview = tool.getPreviewUrl(portal_type, url) if collection and self.resource_type.allow_browse: src = obj.absolute_url() @@ -289,6 +291,11 @@ if UID and self.linkbyuid: url = self.base+'/resolveuid/%s' % UID + if self.showimagesize: + normal = tool.getNormalUrl(portal_type, url) + else: + normal = url + sizes = self.get_image_sizes(obj, portal_type, url) icon = self.icon(obj.getIcon(1)) @@ -307,7 +314,7 @@ return { 'id': id, - 'url': url, + 'url': normal, 'portal_type': portal_type, 'collection': collection, 'icon': icon, @@ -334,7 +341,8 @@ url = brain.getURL() portal_type = brain.portal_type collection = portal_type in self.coll_types - preview = self.tool.getPreviewUrl(portal_type, url) + tool = self.tool + preview = tool.getPreviewUrl(portal_type, url) # Path for the uid catalog doesn't have the leading '/' path = brain.getPath() @@ -360,6 +368,11 @@ if UID and self.linkbyuid: url = self.base+'/resolveuid/%s' % UID + if self.showimagesize: + normal = tool.getNormalUrl(portal_type, url) + else: + normal = url + sizes = self.get_image_sizes(brain, portal_type, url) icon = self.icon(brain.getIcon) @@ -377,7 +390,7 @@ return { 'id': id, - 'url': url, + 'url': normal, 'portal_type': portal_type, 'collection': collection, 'icon': icon, Modified: kupu/trunk/kupu/plone/plonelibrarytool.py ============================================================================== --- kupu/trunk/kupu/plone/plonelibrarytool.py (original) +++ kupu/trunk/kupu/plone/plonelibrarytool.py Fri Sep 22 13:23:55 2006 @@ -497,6 +497,18 @@ expr = action_map.get(portal_type, {}).get('expression', '') return getattr(expr, 'text', expr) + security.declareProtected(permissions.ManageLibraries, "getNormalViewForType") + def getNormalViewForType(self, portal_type): + action_map = getattr(self, '_preview_actions', {}) + expr = action_map.get(portal_type, {}).get('normal', '') + return getattr(expr, 'text', expr) + + security.declareProtected(permissions.ManageLibraries, "getScaleFieldForType") + def getScaleFieldForType(self, portal_type): + action_map = getattr(self, '_preview_actions', {}) + value = action_map.get(portal_type, {}).get('scalefield', 'image') + return value + security.declareProtected(permissions.ManageLibraries, "configure_kupu") def configure_kupu(self, Modified: kupu/trunk/kupu/plone/resource_types.pt ============================================================================== --- kupu/trunk/kupu/plone/resource_types.pt (original) +++ kupu/trunk/kupu/plone/resource_types.pt Fri Sep 22 13:23:55 2006 @@ -127,33 +127,52 @@ previewable python:[t for t in typeinfos if context.getPreviewForType(t.getId())];"> - Preview URLs + Action URLs Type - URL + URL - + - previewable type + type + preview + tal:attributes="value previewaction" /> + + + + Normal Image + + + + + + fieldname + + @@ -161,10 +180,10 @@ - + - + + preview + + Normal Image + + + + + + fieldname + + + + - - + + + Preview is an expression to use for the preview image in the drawer [default is no preview]. + Normal image is an expression to use for the normal view of a mediaobject [string:$object_url]. + Fieldname is the name of the field to use for scaled variants of the mediaobject [image]. + + From duncan at codespeak.net Fri Sep 22 13:45:33 2006 From: duncan at codespeak.net (duncan at codespeak.net) Date: Fri, 22 Sep 2006 13:45:33 +0200 (CEST) Subject: [kupu-checkins] r32575 - kupu/trunk/kupu/tests Message-ID: <20060922114533.CAD1D10070@code0.codespeak.net> Author: duncan Date: Fri Sep 22 13:45:32 2006 New Revision: 32575 Modified: kupu/trunk/kupu/tests/test_plone.js Log: Unit test for span highlighting was failing on IE (because no quotes round the classname). Modified: kupu/trunk/kupu/tests/test_plone.js ============================================================================== --- kupu/trunk/kupu/tests/test_plone.js (original) +++ kupu/trunk/kupu/tests/test_plone.js Fri Sep 22 13:45:32 2006 @@ -125,12 +125,12 @@ this.testSetTextSpanStyle = function() { var data = '

some text

some more

'; - var expected = '

some text

some more

'; + var expected = '

some text

some more

'; this.body.innerHTML = data; this._setSelection(5, null, 14, null, 'textsome'); var ui = new KupuUI('span-styles'); ui.editor = this.editor; - ui.setTextStyle('span|highlight'); + ui.setTextStyle('span|high light'); this.assertEquals(this._cleanHtml(this.body.innerHTML), expected); } } From duncan at codespeak.net Sat Sep 23 13:04:00 2006 From: duncan at codespeak.net (duncan at codespeak.net) Date: Sat, 23 Sep 2006 13:04:00 +0200 (CEST) Subject: [kupu-checkins] r32605 - in kupu/trunk/kupu: common tests Message-ID: <20060923110400.CD14410071@code0.codespeak.net> Author: duncan Date: Sat Sep 23 13:03:55 2006 New Revision: 32605 Modified: kupu/trunk/kupu/common/kupubasetools.js kupu/trunk/kupu/common/kupueditor.js kupu/trunk/kupu/common/kupuhelpers.js kupu/trunk/kupu/common/kupustyles.css kupu/trunk/kupu/tests/run_tests.html kupu/trunk/kupu/tests/test_kupubasetools.js kupu/trunk/kupu/tests/test_kupuhelpers.js kupu/trunk/kupu/tests/test_plone.js Log: Applied patch from George Lee to support paragraph formatting inside table cells. Modified the style pulldown to distinguish 'Plain Cell' (TD) from 'Normal' (P), and to add a 'No char style' for removing a SPAN. Added a bunch more unit tests for style selection. Still to do: need some way to remove Normal styling inside a table: I plan to add a 'Remove block style' option which can be used anywhere inside a block tag to remove it. Modified: kupu/trunk/kupu/common/kupubasetools.js ============================================================================== --- kupu/trunk/kupu/common/kupubasetools.js (original) +++ kupu/trunk/kupu/common/kupubasetools.js Sat Sep 23 13:03:55 2006 @@ -251,7 +251,10 @@ this.otherstyle = null; this.tablestyles = {}; this.styles = {}; // use an object here so we can use the 'in' operator later on - + var blocktagre = /^(p|div|h.|ul|ol|dl|menu|dir|pre|blockquote|address|center)$/i; + var spanre = /^span\b/i; + var tblre = /^thead|tbody|table|t[rdh]\b/i; + this.initialize = function(editor) { /* initialize the ui like tools */ this.editor = editor; @@ -332,13 +335,16 @@ var options = this.tsselect.options; var parastyles = this.styles; var tablestyles = this.tablestyles; + var styleoptions = []; - tableoptions.push([options[0].text, 'td|']); - tablestyles['td'] = 0; - paraoptions.push([options[0].text, 'p|']); - parastyles['p'] = 0; - while (options.length > 1) { - opt = options[1]; + var normal = ['Normal', 'p|']; + var td = ['Plain Cell', 'td|']; + var nochar = ['No char style', 'span|']; + + var opts = []; + while (options.length) { + opt = options[0]; + options[0] = null; var v = opt.value; if (v.indexOf('|') > -1) { var split = v.split('|'); @@ -346,21 +352,53 @@ } else { v = v.toLowerCase()+"|"; }; - var optarray = [opt.text,v]; - if (/^thead|tbody|table|t[rdh]\b/i.test(v)) { + var optarray = [opt.text, v]; + if (v=='td|') { + td = optarray; + } else if (v=='p|') { + normal = optarray; + } else if (v=='span|') { + nochar = optarray; + } else { + opts.push([opt.text,v]); + } + } + tableoptions.push(td); + tablestyles[td[1]] = 0; + paraoptions.push(normal); + parastyles[normal[1]] = 0; + styleoptions.push(nochar); + + for (i = 0; i < opts.length; i++) { + optarray = opts[i]; + v = optarray[1]; + + if (spanre.test(v)) { + styleoptions.push(optarray); + } else if (tblre.test(v)) { + tablestyles[v] = tableoptions.length; tableoptions.push(optarray); - tablestyles[v] = tableoptions.length-1; } else { + parastyles[v] = paraoptions.length; paraoptions.push(optarray); - parastyles[v] = paraoptions.length-1; - if (/^span\b/i.test(v)) { - tableoptions.push(optarray); - tablestyles[v] = tableoptions.length-1; - }; }; - options[1] = null; + }; + if (styleoptions.length > 1) { + for (var i = 0; i < styleoptions.length; i++) { + optarray = styleoptions[i]; + parastyles[optarray[1]] = paraoptions.length; + paraoptions.push(optarray); + } + }; + if (tableoptions.length < 2) { + tableoptions[0] = null; + } + // tableoptions needs paraoptions appended + for (var i = 0; i < paraoptions.length; i++) { + optarray = paraoptions[i]; + tablestyles[optarray[1]] = tableoptions.length; + tableoptions.push(optarray); } - options[0] = null; } // Remove otherstyle and switch to appropriate style set. @@ -383,7 +421,7 @@ opt.text = valid[i][0]; var v = valid[i][1]; opt.value = v; - opt.className=(/^span\b/i.test(v))?"kupuCharStyle":"kupuParaStyle"; + opt.className=(tblre.test(v))?"kupuTableStyle":(spanre.test(v))?"kupuCharStyle":"kupuParaStyle"; options.add(opt); } select.selectedIndex = 0; @@ -410,8 +448,22 @@ var options = this.tsselect.options; this.styletag = undefined; this.classname = ''; + + // Set the table state correctly this.intable = false; + while(currnode) { + var tag = currnode.nodeName; + if (/^body$/i.test(tag)) break; + if (tblre.test(tag)) { + this.intable = true; + break; + }; + currnode = currnode.parentNode; + }; + var styles = this.intable? this.tablestyles : this.styles; + + currnode = node; while (currnode) { var tag = currnode.nodeName.toLowerCase(); @@ -423,15 +475,14 @@ } break; } - if (/^span$/.test(tag)) { - index = this.setIndex(currnode, tag, index, this.styles); + if (spanre.test(tag)) { + index = this.setIndex(currnode, tag, index, styles); if (index > 0) return index; // span takes priority - } else if (/^(p|div|h.|ul|ol|dl|menu|dir|pre|blockquote|address|center)$/.test(tag)) { - index = this.setIndex(currnode, tag, index, this.styles); - } else if (/^thead|tbody|table|t[rdh]$/.test(tag)) { - this.intable = true; - index = this.setIndex(currnode, tag, index, this.tablestyles); - + } else if (blocktagre.test(tag)) { + index = this.setIndex(currnode, tag, index, styles); + } else if (tblre.test(tag)) { + if (index > 0) return index; // block or span takes priority. + index = this.setIndex(currnode, tag, index, styles); if (index > 0 || tag=='table') { return index; // Stop processing if in a table } @@ -473,7 +524,6 @@ if (index===undefined) { index = this.nodeStyle(selNode); } - this.enableOptions(this.intable); if (index < 0 || mixed) { @@ -519,50 +569,79 @@ }; } - this._cleanCell = function(eltype, classname) { - var selNode = this.editor.getSelectedNode(); + this._cleanCell = function(eltype, classname, strip) { + var selNode = this.editor.getSelectedNode(true); var el = this.editor.getNearestParentOfType(selNode, eltype); if (!el) { // Maybe changing type el = this.editor.getNearestParentOfType(selNode, eltype=='TD'?'TH':'TD'); } - if (!el) return; - // Remove formatted div or p from a cell - var node, nxt, n; - for (node = el.firstChild; node;) { - if (/DIV|P/.test(node.nodeName)) { - for (var n = node.firstChild; n;) { - var nxt = n.nextSibling; - el.insertBefore(n, node); // Move nodes out of div - n = nxt; + //either the selection is inside a cell, spans cells, or includes + //a collection of cells + + //first, if contained in a cell + + if (el) { + if (eltype != el.tagName) { + // Change node type. + var node = el.ownerDocument.createElement(eltype); + var parent = el.parentNode; + parent.insertBefore(node, el); + while (el.firstChild) { + node.appendChild(el.firstChild); } - nxt = node.nextSibling; - el.removeChild(node); - node = nxt; - } else { - node = node.nextSibling; + parent.removeChild(el); + el = node; } - } - if (eltype != el.tagName) { - // Change node type. - var node = el.ownerDocument.createElement(eltype); - var parent = el.parentNode; - parent.insertBefore(node, el); - while (el.firstChild) { - node.appendChild(el.firstChild); - } - parent.removeChild(el); - el = node; - } - // now set the classname - if (classname) { - el.className = classname; + // now set the classname + this._setClass(el, classname); + if (strip && el.childNodes.length==1) { + var node = el.firstChild; + if (blocktagre.test(node.nodeName)) { + for (var n = node.firstChild; n;) { + var nxt = n.nextSibling; + el.insertBefore(n, node); // Move nodes out of block + n = nxt; + }; + nxt = node.nextSibling; + el.removeChild(node); + node = nxt; + }; + }; } else { - el.removeAttribute("class"); - el.removeAttribute("className"); - } + //otherwise, find all cells that intersect the selection + var selection = this.editor.getSelection(); + var tdNodes = selNode.getElementsByTagName('TD'); + var thNodes = selNode.getElementsByTagName('TH'); + var cellNodes = Array(); + for (var i = 0; i < tdNodes.length; i++) { + cellNodes.push(tdNodes.item(i)); + }; + for (var i = 0; i < thNodes.length; i++) { + cellNodes.push(thNodes.item(i)); + }; + + for (var i = 0; i < cellNodes.length; i++) { + el = cellNodes[i]; + + if(selection.intersectsNode(el)) { + if (eltype != el.tagName) { + // Change node type. + var node = el.ownerDocument.createElement(eltype); + var parent = el.parentNode; + parent.insertBefore(node, el); + while (el.firstChild) { + node.appendChild(el.firstChild); + }; + parent.removeChild(el); + el = node; + }; + this._setClass(el, classname); + } + } + } } this._setClass = function(el, classname) { @@ -607,7 +686,7 @@ if (this.editor.getBrowserName() == 'IE') { command = '<' + eltype + '>'; }; - if (/T[RDH]/.test(eltype)) { + if (tblre.test(eltype)) { this._cleanCell(eltype, classname); } else if (eltype=='SPAN') { doc.execCommand('removeformat', null); @@ -649,7 +728,7 @@ doc.execCommand('formatblock', command); // now get a reference to the element just added - var selNode = this.editor.getSelectedNode(); + var selNode = this.editor.getSelectedNode(true); var el = this.editor.getNearestParentOfType(selNode, eltype); if (el) { this._setClass(el, classname); @@ -1695,7 +1774,7 @@ // Remove formatted div or p from a cell var node, nxt, n; for (node = el.firstChild; node;) { - if (/DIV|P/.test(node.nodeName)) { + if (/^DIV|P$/i.test(node.nodeName)) { for (var n = node.firstChild; n;) { var nxt = n.nextSibling; el.insertBefore(n, node); // Move nodes out of div Modified: kupu/trunk/kupu/common/kupueditor.js ============================================================================== --- kupu/trunk/kupu/common/kupueditor.js (original) +++ kupu/trunk/kupu/common/kupueditor.js Sat Sep 23 13:03:55 2006 @@ -363,9 +363,12 @@ return this.getDocument().getSelection(); }; - this.getSelectedNode = function() { + this.getSelectedNode = function(allowmulti) { /* returns the selected node (read: parent) or none */ - return this.getSelection().parentElement(); + /* if allowmulti is true, returns the parent of all ranges in the + selection (in the rare case that selection has more than one + range) */ + return this.getSelection().parentElement(allowmulti); }; this.getNearestParentOfType = function(node, type) { @@ -832,3 +835,4 @@ } } + Modified: kupu/trunk/kupu/common/kupuhelpers.js ============================================================================== --- kupu/trunk/kupu/common/kupuhelpers.js (original) +++ kupu/trunk/kupu/common/kupuhelpers.js Sat Sep 23 13:03:55 2006 @@ -749,7 +749,7 @@ return length; }; - this.parentElement = function() { + this.parentElement = function(allowmulti) { /* return the selected node (or the node containing the selection) */ // XXX this should be on a range object if (this.selection.rangeCount == 0) { @@ -759,45 +759,114 @@ }; } else { var range = this.selection.getRangeAt(0); - var parent = range.commonAncestorContainer; + var parent = this.parentElementOfRange(range); + if( allowmulti ) { + var numRanges = this.selection.rangeCount; + for( var i = 1; i < numRanges; i = i + 1 ) + { + var parent1 = parent; + var parent2 = null; + var range1 = this.document.getDocument().createRange(); + var range2 = this.document.getDocument().createRange(); + + var parent2 = this.parentElementOfRange(this.selection.getRangeAt(i)); - // the following deals with cases where only a single child is - // selected, e.g. after a click on an image - var inv = range.compareBoundaryPoints(Range.START_TO_END, range) < 0; - var startNode = inv ? range.endContainer : range.startContainer; - var startOffset = inv ? range.endOffset : range.startOffset; - var endNode = inv ? range.startContainer : range.endContainer; - var endOffset = inv ? range.startOffset : range.endOffset; - - var selectedChild = null; - var child = parent.firstChild; - while (child) { - // XXX the additional conditions catch some invisible - // intersections, but still not all of them - if (range.intersectsNode(child) && - !(child == startNode && startOffset == child.length) && - !(child == endNode && endOffset == 0)) { - if (selectedChild) { - // current child is the second selected child found - selectedChild = null; - break; + range1.selectNode(parent1); + range2.selectNode(parent2); + + if( range1.compareBoundaryPoints(Range.START_TO_START, range2) <= 0 + && range1.compareBoundaryPoints(Range.END_TO_END, range2) >= 0 ) { + //parent1 contains parent2 + parent = parent1; + } else if( range1.compareBoundaryPoints(Range.START_TO_START, range2) >= 0 + && range1.compareBoundaryPoints(Range.END_TO_END, range2) <= 0 ) { + //parent2 contains parent1 + parent = parent2; + } else if( range1.compareBoundaryPoints(Range.START_TO_END, range2) <= 0 ) { + //parent1 comes before parent2 + //commonAncestorContainer returns the node parent if a range is + //just one node, which we don't want; but since parent1 + //and parent2 are different, their range is not just + //one node + var coverRange = this.document.getDocument().createRange(); + coverRange.setStartBefore(parent1); + coverRange.setEndAfter(parent2); + parent = coverRange.commonAncestorContainer; } else { - // current child is the first selected child found - selectedChild = child; + //parent2 comes before parent1 + //commonAncestorContainer returns the node parent if a range is + //just one node, which we don't want; but since parent1 + //and parent2 are different, their range is not just + //one node + var coverRange = this.document.getDocument().createRange(); + coverRange.setStartBefore(parent2); + coverRange.setEndAfter(parent1); + parent = coverRange.commonAncestorContainer; }; - } else if (selectedChild) { - // current child is after the selection - break; }; - child = child.nextSibling; }; - if (selectedChild) { - parent = selectedChild; + }; + + if (parent.nodeType == Node.TEXT_NODE) { + parent = parent.parentNode; + }; + return parent; + }; + + this.parentElementOfRange = function(range) { + if( range.compareBoundaryPoints(Range.START_TO_END, range) < 0 ) { + var startNode = range.endContainer; + var startOffset = range.endOffset; + var endNode = range.startContainer; + var endOffset = range.startOffset; + range.setStart( startNode, startOffset ); + range.setEnd( endNode, endOffset ); + } + + var parent = range.commonAncestorContainer; + + // if there is only a single node selected, e.g. after a click on + // an image, then this node itself should be returned as the + // parentElement. however, in this case, "parent" is the selected + // node's parent. the following searches if any other node + // intersects the selection range; if not, then the selected node + // is set to the parentElement. + var inv = range.compareBoundaryPoints(Range.START_TO_END, range) < 0; + var startNode = inv ? range.endContainer : range.startContainer; + var startOffset = inv ? range.endOffset : range.startOffset; + var endNode = inv ? range.startContainer : range.endContainer; + var endOffset = inv ? range.startOffset : range.endOffset; + + var selectedChild = null; + var child = parent.firstChild; + while (child) { + if (range.intersectsNode(child) && + !(child == startNode && startOffset == child.length) && + !(child == endNode && endOffset == 0)) { + if (selectedChild) { + // current child is the second node found that + // intersects the selection, so commonAncestorContainer + // is the correct parentElement to use + selectedChild = null; + break; + } else { + // current child is the first selected child found + selectedChild = child; + }; + } else if (selectedChild) { + // current child is after the selection + break; }; + child = child.nextSibling; + }; + + if (selectedChild) { + parent = selectedChild; }; if (parent.nodeType == Node.TEXT_NODE) { parent = parent.parentNode; }; + return parent; }; @@ -901,6 +970,15 @@ selection.removeAllRanges(); selection.addRange(range); } + + this.intersectsNode = function(node) { + for(var i = 0; i < this.selection.rangeCount; i++ ) { + if( this.selection.getRangeAt(i).intersectsNode(node) ) { + return true; + } + }; + return false; + }; }; MozillaSelection.prototype = new BaseSelection; @@ -1068,7 +1146,7 @@ return length; }; - this.parentElement = function() { + this.parentElement = function(allowmulti) { /* return the selected node (or the node containing the selection) */ // XXX this should be on a range object if (this.selection.type == 'Control') { @@ -1144,6 +1222,19 @@ this.toString = function() { return this.selection.createRange().text; }; + + this.intersectsNode = function(node) { + var noderange = doc.body.createTextRange(); + noderange.moveToElementText(node); + + var selrange = this.selection.createRange(); + + if((selrange.compareEndPoints('StartToStart', noderange) <= 0 && selrange.compareEndPoints('EndToStart', noderange) > 0) + ||(selrange.compareEndPoints('StartToStart', noderange) > 0 && selrange.compareEndPoints('StartToEnd', noderange) < 0)) { + return true; + } + return false; + }; }; IESelection.prototype = new BaseSelection; Modified: kupu/trunk/kupu/common/kupustyles.css ============================================================================== --- kupu/trunk/kupu/common/kupustyles.css (original) +++ kupu/trunk/kupu/common/kupustyles.css Sat Sep 23 13:03:55 2006 @@ -279,6 +279,10 @@ filter:alpha(opacity=50); } +.kupuTableStyle { + font-style: underline; + background-color: #82feff; +} .kupuCharStyle { font-style: italic; background-color: #feff82; Modified: kupu/trunk/kupu/tests/run_tests.html ============================================================================== --- kupu/trunk/kupu/tests/run_tests.html (original) +++ kupu/trunk/kupu/tests/run_tests.html Sat Sep 23 13:03:55 2006 @@ -94,17 +94,21 @@

foo	foz
bar	baz

foo	foz
bar	baz

foo	foz
bar	baz

foo	foz
bar	baz

Debug Log

bar

bar

bar

foo

bar

foo

bar