[KSS-checkins] r50852 - in kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo: . selenium_tests
jone at codespeak.net
jone at codespeak.net
Mon Jan 21 20:46:54 CET 2008
Author: jone
Date: Mon Jan 21 20:46:52 2008
New Revision: 50852
Added:
kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/selenium_tests/typewriter.html
Modified:
kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/dynamic_table.kss
kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/dynamic_table.pt
kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/dynamic_table.py
kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.css
kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.pt
kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.py
kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.pyc
Log:
polished typewriter, added selenium test
Modified: kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/dynamic_table.kss
==============================================================================
--- kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/dynamic_table.kss (original)
+++ kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/dynamic_table.kss Mon Jan 21 20:46:52 2008
@@ -1,11 +1,7 @@
input#submit:click {
evt-click-preventdefault: true;
action-server: addPerson;
- addPerson-name: currentFormVar(name);
- addPerson-address: currentFormVar(address);
- addPerson-city: currentFormVar(city);
- addPerson-country: currentFormVar(country);
- addPerson-telephone: currentFormVar(telephone);
+ addPerson-kssSubmitForm: currentForm();
}
input#clean:click {
Modified: kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/dynamic_table.pt
==============================================================================
--- kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/dynamic_table.pt (original)
+++ kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/dynamic_table.pt Mon Jan 21 20:46:52 2008
@@ -44,8 +44,8 @@
<input type="text" name="telephone" />
</div>
<div>
- <input type="submit" id="submit" value="Save" />
- <input type="reset" />
+ <input type="submit" id="submit" value="Save" class="button" />
+ <input type="reset" class="button" value="Reset Form" />
</div>
</form>
@@ -53,7 +53,7 @@
<div class="centered">
- <input type="button" id="clean" value="Clean table" />
+ <input type="button" class="button" id="clean" value="Clear Addressbook" />
<table id="personTable">
<thead>
Modified: kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/dynamic_table.py
==============================================================================
--- kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/dynamic_table.py (original)
+++ kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/dynamic_table.py Mon Jan 21 20:46:52 2008
@@ -127,11 +127,11 @@
def renderPersonAsTr(self, person):
pid = person['pid']
buttons = '''
- <input type="button" class="remove kssattr-pid-%(pid)s" value="remove">
- <input type="button" class="moveUp kssattr-pid-%(pid)s" value="up">
- <input type="button" class="moveDown kssattr-pid-%(pid)s" value="down">
- <input type="button" class="toTop kssattr-pid-%(pid)s" value="top">
- <input type="button" class="toBottom kssattr-pid-%(pid)s" value="bottom">
+ <input type="button" class="button remove kssattr-pid-%(pid)s" value="Remove">
+ <input type="button" class="button moveUp kssattr-pid-%(pid)s" value="Up">
+ <input type="button" class="button moveDown kssattr-pid-%(pid)s" value="Down">
+ <input type="button" class="button toTop kssattr-pid-%(pid)s" value="Top">
+ <input type="button" class="button toBottom kssattr-pid-%(pid)s" value="Bottom">
''' % {'pid' : pid}
html = """<tr id="pid%(pid)s"><td>%(name)s</td><td>%(address)s</td><td>%(city)s</td><td>%(country)s</td><td>%(telephone)s</td><td>%(buttons)s</td></tr>""" % {
'pid' : person['pid'],
Added: kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/selenium_tests/typewriter.html
==============================================================================
--- (empty file)
+++ kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/selenium_tests/typewriter.html Mon Jan 21 20:46:52 2008
@@ -0,0 +1,144 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>typewriter</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">typewriter</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/demo/typewriter.html</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>Typewriter</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>pattern</td>
+ <td>This is our first lesson at the SnowSprint</td>
+</tr>
+<tr>
+ <td>shiftKeyDown</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>keyDown</td>
+ <td>field</td>
+ <td>\16</td>
+</tr>
+<tr>
+ <td>waitForText</td>
+ <td>key_116</td>
+ <td>T</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>key_116</td>
+ <td>T</td>
+</tr>
+<tr>
+ <td>keyDown</td>
+ <td>field</td>
+ <td>T</td>
+</tr>
+<tr>
+ <td>waitForAttribute</td>
+ <td>key_116 at class</td>
+ <td>key active</td>
+</tr>
+<tr>
+ <td>assertAttribute</td>
+ <td>key_116 at class</td>
+ <td>key active</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>pattern</td>
+ <td>his is our first lesson at the SnowSprint</td>
+</tr>
+<tr>
+ <td>keyUp</td>
+ <td>field</td>
+ <td>T</td>
+</tr>
+<tr>
+ <td>waitForAttribute</td>
+ <td>key_116 at class</td>
+ <td>key</td>
+</tr>
+<tr>
+ <td>assertAttribute</td>
+ <td>key_116 at class</td>
+ <td>key</td>
+</tr>
+<tr>
+ <td>keyUp</td>
+ <td>field</td>
+ <td>\16</td>
+</tr>
+<tr>
+ <td>shiftKeyUp</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>keyDown</td>
+ <td>field</td>
+ <td>h</td>
+</tr>
+<tr>
+ <td>waitForAttribute</td>
+ <td>key_104 at class</td>
+ <td>key active</td>
+</tr>
+<tr>
+ <td>assertAttribute</td>
+ <td>key_104 at class</td>
+ <td>key active</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>pattern</td>
+ <td>is is our first lesson at the SnowSprint</td>
+</tr>
+<tr>
+ <td>keyUp</td>
+ <td>field</td>
+ <td>h</td>
+</tr>
+<tr>
+ <td>waitForAttribute</td>
+ <td>key_104 at class</td>
+ <td>key</td>
+</tr>
+<tr>
+ <td>assertAttribute</td>
+ <td>key_104 at class</td>
+ <td>key</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>lesson_1</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForText</td>
+ <td>pattern</td>
+ <td>KSS is a generic javascript AJAX framework</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>pattern</td>
+ <td>KSS is a generic javascript AJAX framework</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Modified: kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.css
==============================================================================
--- kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.css (original)
+++ kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.css Mon Jan 21 20:46:52 2008
@@ -33,13 +33,7 @@
border-top: 1px solid #FF4916;
}
-input.lesson {
- color: #FF4916;
- background: none;
- border: 1px solid #FF4916;
-}
-
-input.lesson:hover, input.lesson.active {
+input.lesson.active {
background-color: #FF4916;
color: white;
cursor: pointer;
Modified: kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.pt
==============================================================================
--- kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.pt (original)
+++ kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.pt Mon Jan 21 20:46:52 2008
@@ -21,7 +21,7 @@
<input type="button" class="lesson"
tal:attributes="value lesson;
id python:'lesson_%s' % str(view.getLessonTitles().index(lesson));
- class python:view.getLessonTitles()[0]==lesson and 'lesson active' or 'lesson';" />
+ class python:view.getLessonTitles()[0]==lesson and 'lesson button active' or 'lesson button';" />
</tal:block>
<br />
Modified: kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.py
==============================================================================
--- kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.py (original)
+++ kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.py Mon Jan 21 20:46:52 2008
@@ -50,7 +50,7 @@
def getLessons(self):
lessons = {
'Lesson 1' : 'This is our first lesson at the SnowSprint',
- 'Lesson 2' : 'WTF',
+ 'Lesson 2' : 'KSS is a generic javascript AJAX framework',
}
return lessons
@@ -66,7 +66,10 @@
for key in range(97, 97+26):
self.getCommandSet('core').replaceInnerHTML('div#key_%s' % key, chr(key).upper())
elif keycode in range(97, 97+26) + range(65, 65+26) + [32]:
- self.getCommandSet('core').addClass('div#key_%s' % keycode, 'active')
+ smallKeycode = keycode
+ if keycode in range(65, 65+26):
+ smallKeycode += 32
+ self.getCommandSet('core').addClass('div#key_%s' % smallKeycode, 'active')
currentText = self.context.getValue('typewriter', '')
if len(currentText)>0 and currentText[0]==chr(keycode):
currentText = currentText[1:]
@@ -83,5 +86,8 @@
for key in range(97, 97+26):
self.getCommandSet('core').replaceInnerHTML('div#key_%s' % key, chr(key))
elif keycode in range(97, 97+26) + range(65, 65+26) + [32]:
- self.getCommandSet('core').removeClass('div#key_%s' % keycode, 'active')
+ smallKeycode = keycode
+ if keycode in range(65, 65+26):
+ smallKeycode += 32
+ self.getCommandSet('core').removeClass('div#key_%s' % smallKeycode, 'active')
return self.render()
Modified: kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.pyc
==============================================================================
Binary files. No diff available.
More information about the Kukit-checkins
mailing list