@@ -25,11 +25,12 @@ class GridTest:
RootPanel().add(self.add)
RootPanel().add(self.g)
- def onClick(self, sender):
+ def onClick(self, sender, event):
if sender==self.add:
self.page+=1
elif sender==self.sub:
self.page-=1
+ print "onClick", sender, self.page
self.updatePageDisplay()
@@ -38,7 +39,7 @@ class GridTest:
elif self.page>self.max_page: self.page=self.max_page
total_pages=(self.max_page-self.min_page) + 1
- self.g.setHTML(0, 4, "<b>page " + self.page + ' of ' + total_pages + "</b>")
+ self.g.setHTML(0, 4, "<b>page " + str(self.page) + ' of ' + str(total_pages) + "</b>")
if self.page>=self.max_page:
self.add.setEnabled(False)
@@ -52,7 +53,7 @@ class GridTest:
for y in range(1, 5):
for x in range(5):
- self.g.setText(y, x, self.page + ' (' + y + ',' + x + ')')
+ self.g.setText(y, x, str(self.page) + ' (' + str(y) + ',' + str(x) + ')')
pyjamas-web/examples/gridtest/GridTest.py
@@ -7,3 +7,5 @@ doc = etree.HTML(broken_html)
print doc, doc.attrib, dir(doc), dir(doc[0])
print etree.tostring(doc)
print doc.find('body')
+print doc.makeelement.__doc__
+print dir(etree)
pyjamas-web/f.py
@@ -412,6 +412,10 @@ def getEventListener(element):
""")
def getFirstChild(elem):
+ print "TODO: resolve 'node type'..."
+ if len(elem) == 0:
+ return None
+ return elem[0]
JS("""
var child = elem.firstChild;
while (child && child.nodeType != 1)
@@ -654,10 +658,13 @@ def removeAttribute(element, attribute):
""")
def setAttribute(element, attribute, value):
- element.attrib[attribute] = value
+ element.attrib[attribute] = str(value)
def setBooleanAttribute(elem, attr, value):
- elem.attrib[attribute] = bool(value)
+ if value:
+ elem.attrib[attr] = ""
+ elif hasattr(elem.attrib, attr):
+ del elem.attrib[attr]
def setCapture(elem):
JS("""
@@ -681,20 +688,19 @@ def setEventListener(element, listener):
def setInnerHTML(element, html):
if not html:
html = ''
- element.text = html
- return
- JS("""
- if (!html) {
- html = "";
- }
- element.innerHTML = html;
- """)
+ while len(element) > 0:
+ child = element[0]
+ element.remove(child)
+ from lxml.html.soupparser import fromstring
+ nodes = fromstring(html)
+ element.append(nodes)
+ return
def setInnerText(elem, text):
while len(elem) > 0:
- elem.remove(0)
+ child = elem[0]
+ elem.remove(child)
elem.text = text
- print "TODO - convert to text, disallowing HTML"
return
JS("""
// Remove all children first.
@@ -706,6 +712,8 @@ def setInnerText(elem, text):
""")
def setIntAttribute(elem, attr, value):
+ elem.attrib[attr] = str(value)
+ return
JS("""
elem[attr] = value;
""")
pyjamas-web/library/DOM.py
@@ -21,6 +21,7 @@ import pyjslib
from History import History
import Window
from sets import Set
+from copy import copy, deepcopy
from __pyjamas__ import doc
@@ -463,8 +464,16 @@ class FocusWidget(Widget):
type = DOM.eventGetType(event)
if type == "click":
for listener in self.clickListeners:
- if hasattr(listener, 'onClick'): listener.onClick(self)
- else: listener(self)
+ if hasattr(listener, "onClick"):
+ if listener.onClick.func_code.co_argcount == 2:
+ listener.onClick(self)
+ else:
+ listener.onClick(self, event)
+ else:
+ if listener.func_code.co_argcount == 1:
+ listener(self)
+ else:
+ listener(self, event)
elif type == "blur" or type == "focus":
FocusListener().fireFocusEvent(self.focusListeners, self, event)
elif type == "keydown" or type == "keypress" or type == "keyup":
@@ -785,6 +794,7 @@ class CellFormatter:
DOM.setStyleAttribute(self.getElement(row, column), "whiteSpace", wrap_str)
def getCellElement(self, table, row, col):
+ return table[row][col]
JS("""
var out = table.rows[row].cells[col];
return (out == null ? null : out);
@@ -1196,20 +1206,14 @@ class Grid(HTMLTable):
return self.numRows
def addRows(self, table, numRows, columns):
- JS("""
- var td = $doc.createElement("td");
- td.innerHTML = " ";
- var row = $doc.createElement("tr");
- for(var cellNum = 0; cellNum < columns; cellNum++) {
- var cell = td.cloneNode(true);
- row.appendChild(cell);
- }
- table.appendChild(row);
- for(var rowNum = 1; rowNum < numRows; rowNum++) {
- table.appendChild(row.cloneNode(true));
- }
- """)
-
+ row = DOM.createElement("tr")
+ for cellNum in range(columns):
+ cell = DOM.createElement("td")
+ DOM.setInnerHTML(cell, " ")
+ row.append(cell)
+ table.append(row)
+ for rowNum in range(numRows):
+ table.append(deepcopy(row))
class FlexCellFormatter(CellFormatter):
def __init__(self, outer):
pyjamas-web/library/ui.py
@@ -5,11 +5,9 @@ from copy import copy
from lxml import etree
import sys
-sys.path.append("/home/lkcl/src/pyjamas-desktop/pyjamas-web/examples/helloworld/")
sys.path.append("/home/lkcl/src/pyjamas-desktop/pyjamas-web/library")
from __pyjamas__ import init_doc, doc, doc_process
-from Hello import Hello
#this is the folderish class that manages ZODB-based chats
class ZCTmainpage:
@@ -20,8 +18,14 @@ class ZCTmainpage:
""" returns the index page
"""
- init_doc("/home/lkcl/src/pyjamas-desktop/pyjamas-web/examples/helloworld/Hello.html")
- m = Hello()
+ #sys.path.append("/home/lkcl/src/pyjamas-desktop/pyjamas-web/examples/helloworld/")
+ #from Hello import Hello
+ #init_doc("/home/lkcl/src/pyjamas-desktop/pyjamas-web/examples/helloworld/Hello.html")
+ #m = Hello()
+ sys.path.append("/home/lkcl/src/pyjamas-desktop/pyjamas-web/examples/gridtest/")
+ from GridTest import GridTest
+ init_doc("/home/lkcl/src/pyjamas-desktop/pyjamas-web/examples/gridtest/GridTest.html")
+ m = GridTest()
return doc_process(m, REQUEST)
def registerpage(self, REQUEST):
pyjamas-web/mainpage.py
26ca332d18712a5eb60d087ad281486a58c61e45
lkcl
lkcl@lkcl.net
http://github.com/lkcl/pyjamas-desktop/commit/84d19eb7296e18ac252c888228a3558aaaa84708
84d19eb7296e18ac252c888228a3558aaaa84708
2008-09-05T14:28:28-07:00
2008-09-05T14:28:28-07:00
grid test partially working
8291ebe13bbf1910d27da73a16e5d5833930dfeb
lkcl
lkcl@lkcl.net