pyjamas-web/f.py pyjamas-web/htmldict.py pyjamas-web/index.py pyjamas-web/mainpage.py pyjamas-web/modpython_gateway.py pyjamas-web/tls.py pyjamas-web/zct.py pyjamas-web/zctlogin.py @@ -1,4 +1,4 @@ -from ui import Button, RootPanel +from ui import Button, RootPanel, Label import Window def greet(sender): @@ -8,3 +8,4 @@ class Hello: def onModuleLoad(self): b = Button("Click me", greet) RootPanel().add(b) + RootPanel().add(Label("hello world")) pyjamas-web/examples/helloworld/Hello.py @@ -13,11 +13,13 @@ # limitations under the License. from __pyjamas__ import JS +from lxml import etree sCaptureElem = None sEventPreviewStack = [] def init(): + return JS(""" // Set up capture event dispatchers. $wnd.__dispatchCapturedMouseEvent = function(evt) { @@ -96,9 +98,7 @@ def addEventPreview(preview): sEventPreviewStack.append(preview) def appendChild(parent, child): - JS(""" - parent.appendChild(child); - """) + parent.append(child) def compare(elem1, elem2): JS(""" @@ -118,9 +118,7 @@ def createDiv(): return createElement("div") def createElement(tag): - JS(""" - return $doc.createElement(tag); - """) + return etree.Element(tag) def createFieldSet(): return createElement("fieldset") @@ -329,15 +327,10 @@ def getAbsoluteTop(elem): """) def getAttribute(elem, attr): - JS(""" - var ret = elem[attr]; - return (ret == null) ? null : String(ret); - """) + return elem.attrib.get(attr) def getBooleanAttribute(elem, attr): - JS(""" - return !!elem[attr]; - """) + return bool(getAttribute(elem, attr)) def getCaptureElement(): global sCaptureElem @@ -665,14 +658,10 @@ def removeAttribute(element, attribute): """) def setAttribute(element, attribute, value): - JS(""" - element[attribute] = value; - """) + element.attrib[attribute] = value def setBooleanAttribute(elem, attr, value): - JS(""" - elem[attr] = value; - """) + elem.attrib[attribute] = bool(value) def setCapture(elem): JS(""" @@ -681,6 +670,8 @@ def setCapture(elem): """) def setEventListener(element, listener): + print "TODO" + return """ Register an object to receive event notifications for the given element. The listener's onBrowserEvent() method will be called @@ -692,6 +683,10 @@ def setEventListener(element, listener): """) def setInnerHTML(element, html): + if not html: + html = '' + element.text = html + return JS(""" if (!html) { html = ""; @@ -700,6 +695,11 @@ def setInnerHTML(element, html): """) def setInnerText(elem, text): + while len(elem) > 0: + elem.remove(0) + elem.text = text + print "TODO - convert to text, disallowing HTML" + return JS(""" // Remove all children first. while (elem.firstChild) { @@ -726,6 +726,8 @@ def setOptionText(select, text, index): """) def setStyleAttribute(element, name, value): + print "TODO" + return JS(""" element.style[name] = value; """) pyjamas-web/library/DOM.py @@ -1,6 +1,7 @@ from __pyjamas__ import JS def init(): + return JS(""" $wnd.__historyToken = ''; pyjamas-web/library/History.py @@ -2,6 +2,8 @@ import Location closingListeners = [] resizeListeners = [] +from __pyjamas__ import JS + def addWindowCloseListener(listener): global closingListeners closingListeners.append(listener) @@ -39,7 +41,7 @@ def getClientWidth(): return $doc.body.clientWidth; """) -JS("var Window_location = null") +#JS("var Window_location = null") def getLocation(): global location JS(""" @@ -124,6 +126,8 @@ def fireResizedImpl(): listener.onWindowResized(getClientWidth(), getClientHeight()) def init(): + print "TODO" + return JS(""" $wnd.__pygwt_initHandlers( function() { pyjamas-web/library/Window.py @@ -15,9 +15,10 @@ # iteration from Bob Ippolito's Iteration in JavaScript # pyjs_extend from Kevin Lindsey's Inteheritance Tutorial (http://www.kevlindev.com/tutorials/javascript/inheritance/) -from __pyjamas__ import JS +from pyjamas.__pyjamas__ import JS -JS(""" +if None: + JS(""" StopIteration = function () {}; StopIteration.prototype = new Error(); StopIteration.name = 'StopIteration'; @@ -520,16 +521,6 @@ def slice(object, lower, upper): return null; """) -def str(text): - JS(""" - return String(text); - """) - -def int(text, radix=0): - JS(""" - return parseInt(text, radix); - """) - def len(object): JS(""" if (object==null) return 0; @@ -624,9 +615,7 @@ def isFunction(a): """) def isString(a): - JS(""" - return typeof a == 'string'; - """) + return isinstance(a, str) or isinstance(a, type(u'')) def isNull(a): JS(""" @@ -649,9 +638,7 @@ def isIteratable(a): """) def isNumber(a): - JS(""" - return typeof a == 'number' && isFinite(a); - """) + return type(a) is int or type(a) is long def toJSObjects(x): """ pyjamas-web/library/pyjslib.py @@ -20,6 +20,7 @@ from History import History import Window from sets import Set +from __pyjamas__ import doc class Event: """ @@ -481,6 +482,9 @@ class Button(ButtonBase): self.addClickListener(listener) def adjustType(self, button): + if DOM.getAttribute(button, 'type'): + DOM.setAttribute(button, 'type', 'button') + return JS(""" if (button.type == 'submit') { try { button.setAttribute("type", "button"); } catch (e) { } @@ -1763,6 +1767,7 @@ class RootPanelCls(AbsolutePanel): self.onAttach() def getBodyElement(self): + return doc().find('body') JS(""" return $doc.body; """) @@ -1805,7 +1810,7 @@ class RootPanelCls(AbsolutePanel): def onWindowClosing(cls): return None -def RootPanel(element): +def RootPanel(element=None): if pyjslib.isString(element): return RootPanelCls().get(element) return RootPanelCls(element) pyjamas-web/library/ui.py pyjamas-web/library/f f2cd1c06a364cfa3d42137c363bec4709c45f3db lkcl lkcl@lkcl.net http://github.com/lkcl/pyjamas-desktop/commit/ac478c87f2aec286cf49dbbfbe18222df364feb6 ac478c87f2aec286cf49dbbfbe18222df364feb6 2008-09-05T07:28:14-07:00 2008-09-05T07:28:14-07:00 first revision of pyjamas-web, getting hello world to work d5c971d77fe6f74633b57e033233ed3d4cea4f64 lkcl lkcl@lkcl.net