@@ -84,6 +84,8 @@ class VerticalDemoSlider2(VerticalDemoSlider): self.sinkEvents(Event.MOUSEEVENTS) self.dragging = False + DOM.addEventPreview(self) + def addMouseListener(self, listener): self.mouseListeners.append(listener) @@ -97,6 +99,19 @@ class VerticalDemoSlider2(VerticalDemoSlider): else: VerticalSliderDemo.onBrowserEvent(self, event) + def onEventPreview(self, event): + # preventDefault on mousedown events, outside of the + # dialog, to stop text-selection on dragging + type = DOM.eventGetType(event) + print "onEventPreview", event, type + if type == 'mousedown': + target = DOM.eventGetTarget(event) + event_targets_control = target and DOM.isOrHasChild(self.getElement(), target) + print "onEventPreview", target, event_targets_control + if event_targets_control: + DOM.eventPreventDefault(event) + return VerticalSliderDemo.onEventPreview(self, event) + def onMouseMove(self, sender, x, y): if not self.dragging: return pyjamas-webkit/pyjamas/Controls.py @@ -545,32 +545,61 @@ def insertChild(parent, toAdd, index): else: parent.insert_before(toAdd, before) +class IterChildrenClass: + def __init__(self, elem): + self.parent = elem + self.child = elem.props.first_child + self.lastChild = None + def next (self): + if not self.child: + raise StopIteration + self.lastChild = self.child; + self.child = getNextSibling(self.child) + return self.lastChild + def remove(self): + self.parent.removeChild(self.lastChild); + def __iter__(self): + return self + def iterChildren(elem): """ Returns an iterator over all the children of the given DOM node. """ - JS(""" - var parent = elem; - var child = elem.props.first_child; - var lastChild = null; - return { - 'next': function() { - if (child == null) { - throw StopIteration; - } - lastChild = child; - child = DOM_getNextSibling(child); - return lastChild; - }, - 'remove': function() { - parent.removeChild(lastChild); - }, - __iter__: function() { - return this; - } - }; - """) + return IterChildrenClass(elem) + +class IterWalkChildren: + + def __init__(self, elem): + self.parent = elem + self.child = getFirstChild(elem) + self.lastChild = None + self.stack = [] + + def next(self): + if not self.child: + raise StopIteration + self.lastChild = self.child + first_child = getFirstChild(self.child) + next_sibling = getNextSibling(self.child) + if first_child is not None: + if next_sibling is not None: + self.stack.append((next_sibling, self.parent)) + self.parent = self.child + self.child = first_child + elif next_sibling is not None: + self.child = next_sibling + elif len(self.stack) > 0: + (self.child, self.parent) = self.stack.pop() + else: + self.child = None + return self.lastChild + + def remove(self): + self.parent.removeChild(self.lastChild) + + def __iter__(self): + return self def walkChildren(elem): """ @@ -578,46 +607,8 @@ def walkChildren(elem): iterator/iterable which performs a pre-order traversal of all the children of the given element. """ - JS(""" - var parent = elem; - var child = DOM_getFirstChild(elem); - var lastChild = null; - var stack = []; - var parentStack = []; - return { - 'next': function() { - if (child == null) { - throw StopIteration; - } - lastChild = child; - var props.first_child = DOM_getFirstChild(child); - var props.next_sibling = DOM_getNextSibling(child); - if(props.first_child != null) { - if(props.next_sibling != null) { - stack.push(props.next_sibling); - parentStack.push(parent); - } - parent = child; - child = props.first_child; - } else if(props.next_sibling != null) { - child = props.next_sibling; - } else if(stack.length > 0) { - child = stack.pop(); - parent = parentStack.pop(); - } else { - child = null; - } - return lastChild; - }, - 'remove': function() { - parent.removeChild(lastChild); - }, - __iter__: function() { - return this; - } - }; - """) - + return IterWalkChildren(elem) + def isOrHasChild(parent, child): while child: if parent == child: pyjamas-webkit/pyjamas/DOM.py @@ -42,7 +42,8 @@ class HTTPRequest: xmlHttp = self.doCreateXmlHTTPRequest() if url[0] != '/': uri = get_main_frame().get_uri() - if uri[:7] != 'file://': + if uri[:7] != 'file://' and uri[:7] != 'http://' and \ + uri[:8] != 'https://': slash = uri.rfind('/') url = uri[:slash+1] + url print "xmlHttp", user, pwd, url, postData, handler, dir(xmlHttp) pyjamas-webkit/pyjamas/HTTPRequest.py @@ -1274,90 +1274,6 @@ class FlexTable(HTMLTable): to format the cells in the table. The FlexCellFormatter has methods to set the row or column spans for a cell, as well as change the cell alignment, as shown below. - - Note that if you use row or column spanning, the cells on - the rest of that row or column will be moved over. This - can cause some surprising results. Imagine that you have - a table like this: - - +---+---+---+ - | A | B | C | - +---+---+---+ - | D | E | F | - +---+---+---+ - - If you set up Cell 0,0 to span two columns, like this: - - flexTable.getFlexCellFormatter().setColSpan(0, 0, 2) - - This will cause the table to end up looking like this: - - +-------+---+---+ - | A | B | C | - +---+---+---+---+ - | D | E | F | - +---+---+---+ - - you might expect cell B to be above cell E, but to make this - happen you need to place cell E at (1, 2) rather than (1, 1). - - Each FlexTable also has a RowFormatter which can be used - to change style names, attributes, and the visibility of - rows in the table. - - Source Code Example: - - >>> from ui import SimplePanel, FlexTable, HasAlignment, Button - >>> - >>> class FlexTableDemo(SimplePanel): - >>> def __init__(self): - >>> SimplePanel.__init__(self) - >>> - >>> self._table = FlexTable() - >>> self._table.setBorderWidth(1) - >>> self._table.setWidth("100%") - >>> - >>> cellFormatter = self._table.getFlexCellFormatter() - >>> rowFormatter = self._table.getRowFormatter() - >>> - >>> self._table.setHTML(0, 0, "<b>Mammals</b>") - >>> self._table.setText(1, 0, "Cow") - >>> self._table.setText(1, 1, "Rat") - >>> self._table.setText(1, 2, "Dog") - >>> - >>> cellFormatter.setColSpan(0, 0, 3) - >>> cellFormatter.setHorizontalAlignment(0, 0, HasAlignment.ALIGN_CENTER) - >>> - >>> self._table.setWidget(2, 0, Button("Hide", getattr(self, "hideRows"))) - >>> self._table.setText(2, 1, "1,1") - >>> self._table.setText(2, 2, "2,1") - >>> self._table.setText(3, 0, "1,2") - >>> self._table.setText(3, 1, "2,2") - >>> - >>> cellFormatter.setRowSpan(2, 0, 2) - >>> cellFormatter.setVerticalAlignment(2, 0, HasAlignment.ALIGN_MIDDLE) - >>> - >>> self._table.setWidget(4, 0, Button("Show", getattr(self, "showRows"))) - >>> - >>> cellFormatter.setColSpan(4, 0, 3) - >>> - >>> rowFormatter.setVisible(4, False) - >>> - >>> self.add(self._table) - >>> - >>> - >>> def hideRows(self): - >>> rowFormatter = self._table.getRowFormatter() - >>> rowFormatter.setVisible(2, False) - >>> rowFormatter.setVisible(3, False) - >>> rowFormatter.setVisible(4, True) - >>> - >>> - >>> def showRows(self): - >>> rowFormatter = self._table.getRowFormatter() - >>> rowFormatter.setVisible(2, True) - >>> rowFormatter.setVisible(3, True) - >>> rowFormatter.setVisible(4, False) """ def __init__(self): HTMLTable.__init__(self) @@ -1449,36 +1365,6 @@ class AbsolutePanel(ComplexPanel): Once a widget has been added to an absolute panel, the panel effectively "owns" the positioning of the widget. Any existing positioning attributes on the widget may be modified by the panel. - - Source Code Example: - - >>> from ui import SimplePanel, AbsolutePanel, VerticalPanel, HTML - >>> import DOM - >>> - >>> - >>> class AbsolutePanelDemo(SimplePanel): - >>> def __init__(self): - >>> SimplePanel.__init__(self) - >>> - >>> panel = AbsolutePanel() - >>> - >>> panel.add(self.makeBox("Child 1"), 20, 10) - >>> panel.add(self.makeBox("Child 2"), 30, 30) - >>> - >>> panel.setWidth("100%") - >>> panel.setHeight("100px") - >>> - >>> self.add(panel) - >>> - >>> - >>> def makeBox(self, label): - >>> wrapper = VerticalPanel() - >>> wrapper.setBorderWidth(1) - >>> wrapper.add(HTML(label)) - >>> DOM.setIntAttribute(wrapper.getTable(), "cellPadding", 10) - >>> DOM.setAttribute(wrapper.getTable(), "bgColor", "#C3D9FF") - >>> - >>> return wrapper """ def __init__(self): @@ -1860,37 +1746,6 @@ class DockPanel(CellPanel): vertical alignment to use for new widgets by calling setHorizontalAlignment() and setVerticalAlignment() before the widget is added. - - Source Code Example: - - >>> from ui import SimplePanel, DockPanel, Label, HasAlignment - >>> - >>> class DockPanelDemo(SimplePanel): - >>> def __init__(self): - >>> SimplePanel.__init__(self) - >>> - >>> panel = DockPanel() - >>> panel.setBorderWidth(1) - >>> - >>> north = Label("North") - >>> west = Label("West") - >>> center = Label("Center") - >>> east = Label("East") - >>> south = Label("South") - >>> - >>> panel.setHorizontalAlignment(HasAlignment.ALIGN_CENTER) - >>> panel.setVerticalAlignment(HasAlignment.ALIGN_MIDDLE) - >>> - >>> panel.add(north, DockPanel.NORTH) - >>> panel.add(west, DockPanel.WEST) - >>> panel.add(center, DockPanel.CENTER) - >>> panel.add(east, DockPanel.EAST) - >>> panel.add(south, DockPanel.SOUTH) - >>> - >>> panel.setCellHeight(center, "200px") - >>> panel.setCellWidth(center, "400px") - >>> - >>> self.add(panel) """ CENTER = "center" @@ -2300,29 +2155,6 @@ class FlowPanel(ComplexPanel): with the other elements. Because of this, you may want to avoid using FlowPanel unless you are certain that the items you are adding will flow correctly. - - Source Code Example: - - >>> from ui import SimplePanel, FlowPanel, Button - >>> - >>> class FlowPanelDemo(SimplePanel): - >>> def __init__(self): - >>> SimplePanel.__init__(self) - >>> - >>> flow = FlowPanel() - >>> - >>> flow.add(Button("Item 1")) - >>> flow.add(Button("Item 2")) - >>> flow.add(Button("Item 3")) - >>> flow.add(Button("Item 4")) - >>> flow.add(Button("Item 5")) - >>> flow.add(Button("Item 6")) - >>> flow.add(Button("Item 7")) - >>> flow.add(Button("Item 8")) - >>> flow.add(Button("Item 9")) - >>> flow.add(Button("Item 10")) - >>> flow.setWidth("400px") - >>> self.add(flow) """ def __init__(self): ComplexPanel.__init__(self) @@ -3112,57 +2944,7 @@ class DialogBox(PopupPanel): the dialog box around by clicking on the caption. The DialogBox class makes use of stylesheet definitions; if these - are not supplied, the dialog box will look very strange. The - following stylesheet definitions are used by the example shown below: - - .gwt-DialogBox { - border: 2px outset; - background-color: white; - } - - .gwt-DialogBox .Caption { - background-color: #C3D9FF; - padding: 3px; - margin: 2px; - font-weight: bold; - cursor: default; - } - - .gwt-DialogBox .Contents { - padding: 10px; - } - - Source Code example: - - >>> from ui import SimplePanel, DialogBox, VerticalPanel, HTML, Button - >>> import Window - >>> - >>> class DialogBoxDemo(SimplePanel): - >>> def __init__(self): - >>> SimplePanel.__init__(self) - >>> - >>> self.add(Button("Show Dialog", getattr(self, "showDialog"))) - >>> - >>> - >>> def showDialog(self): - >>> contents = VerticalPanel() - >>> contents.setSpacing(4) - >>> contents.add(HTML('You can place any contents you like in a dialog box.')) - >>> contents.add(Button("Close", getattr(self, "onClose"))) - >>> contents.setStyleName("Contents") - >>> - >>> self._dialog = DialogBox() - >>> self._dialog.setHTML('<b>Welcome to the dialog box</b>') - >>> self._dialog.setWidget(contents) - >>> - >>> left = (Window.getClientWidth() - 200) / 2 - >>> top = (Window.getClientHeight() - 100) / 2 - >>> self._dialog.setPopupPosition(left, top) - >>> self._dialog.show() - >>> - >>> - >>> def onClose(self): - >>> self._dialog.hide() + are not supplied, the dialog box will look very strange. """ def __init__(self, autoHide=None): PopupPanel.__init__(self, autoHide) @@ -4743,20 +4525,14 @@ FormPanel_formId = 0 class FormPanel(SimplePanel): """ - A panel that wraps its contents in an HTML <FORM> element. + A panel that wraps its contents in an HTML "FORM" element. This panel can be used to achieve interoperability with servers that accept traditional HTML form encoding. The following widgets will be submitted to the server if they are contained within this panel: - * L{TextBox} - * L{PasswordTextBox} - * L{RadioButton} - * L{CheckBox} - * L{TextArea} - * L{ListBox} - * L{FileUpload} - * L{Hidden} + L{TextBox}, L{PasswordTextBox}, L{RadioButton}, L{CheckBox}, + L{TextArea}, L{ListBox}, L{FileUpload} and L{Hidden} In particular, FileUpload is only useful when used within a L{FormPanel}, because the browser will only upload files using @@ -4783,41 +4559,6 @@ class FormPanel(SimplePanel): This will ensure that the form is submitted in a way that allows files to be uploaded. - - Source Code Example: - - >>> from ui import SimplePanel, FormPanel, VerticalPanel, HorizontalPanel, TextBox, Label, Button - >>> - >>> class FormPanelDemo(SimplePanel): - >>> def __init__(self): - >>> SimplePanel.__init__(self) - >>> - >>> self.form = FormPanel() - >>> self.form.setAction("http://google.com/search") - >>> self.form.setTarget("results") - >>> - >>> vPanel = VerticalPanel() - >>> - >>> hPanel = HorizontalPanel() - >>> hPanel.add(Label("Search for:")) - >>> - >>> self.field = TextBox() - >>> self.field.setName("q") - >>> hPanel.add(self.field) - >>> - >>> hPanel.add(Button("Submit", getattr(self, "onBtnClick"))) - >>> - >>> vPanel.add(hPanel) - >>> - >>> results = NamedFrame("results") - >>> vPanel.add(results) - >>> - >>> self.form.add(vPanel) - >>> self.add(self.form) - >>> - >>> - >>> def onBtnClick(self): - >>> self.form.submit() """ ENCODING_MULTIPART = "multipart/form-data" ENCODING_URLENCODED = "application/x-www-form-urlencoded" pyjamas-webkit/pyjamas/ui.py 089c5b5056972d02c3570faf7f9cdc68318d7440 Luke Kenneth Casson Leighton lkcl@lkcl.net http://github.com/lkcl/pyjamas-desktop/commit/8ed365b89efe5d1d3451c3e3ced662a2dd014540 8ed365b89efe5d1d3451c3e3ced662a2dd014540 2009-03-04T02:17:34-08:00 2009-03-04T02:17:34-08:00 whoops quite a lot of bits and pieces of experimenting - sorreeeee. added iterChildren and walkChildren functions 8982b5e25d21db40266437615e2e19c8f4550306 Luke Kenneth Casson Leighton lkcl@lkcl.net