[KSS-checkins] r50906 - in kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo: . selenium_tests
jone at codespeak.net
jone at codespeak.net
Wed Jan 23 11:34:38 CET 2008
Author: jone
Date: Wed Jan 23 11:34:36 2008
New Revision: 50906
Modified:
kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/selenium_tests/typewriter.html
kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.kss
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
Log:
typwriter demo: improved mouse support, added mouse tests
Modified: kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/selenium_tests/typewriter.html
==============================================================================
--- kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/selenium_tests/typewriter.html (original)
+++ kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/selenium_tests/typewriter.html Wed Jan 23 11:34:36 2008
@@ -124,6 +124,41 @@
<td>key</td>
</tr>
<tr>
+ <td>mouseDown</td>
+ <td>key_105</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForAttribute</td>
+ <td>key_105 at class</td>
+ <td>key active</td>
+</tr>
+<tr>
+ <td>assertAttribute</td>
+ <td>key_105 at class</td>
+ <td>key active</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>pattern</td>
+ <td>s is our first lesson at the SnowSprint</td>
+</tr>
+<tr>
+ <td>mouseUp</td>
+ <td>key_105</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForAttribute</td>
+ <td>key_105 at class</td>
+ <td>key</td>
+</tr>
+<tr>
+ <td>assertAttribute</td>
+ <td>key_105 at class</td>
+ <td>key</td>
+</tr>
+<tr>
<td>click</td>
<td>lesson_1</td>
<td></td>
Modified: kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.kss
==============================================================================
--- kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.kss (original)
+++ kukit/kss.core/branch/improve-demos/kss/core/plugins/core/demo/typewriter.kss Wed Jan 23 11:34:36 2008
@@ -11,13 +11,14 @@
}
div.key:mousedown {
- action-server: typewriter_mousedown;
- typewriter_mousedown-content: nodeContent();
+ action-server: typewriter_mousedown;
+ typewriter_mousedown-content: nodeContent();
}
div.key:mouseup {
- action-server: typewriter_mouseup;
- typewriter_mouseup-content: nodeContent();
+ action-server: typewriter_mouseup;
+ typewriter_mouseup-content: nodeContent();
+ typewriter_mouseup-fieldValue: currentFormVar(field);
}
body:load {
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 Wed Jan 23 11:34:36 2008
@@ -26,37 +26,40 @@
<br />
<br />
+ <form id="form">
- <div id="pattern" tal:content="view/loadInitialPattern"></div>
+ <div id="pattern" tal:content="view/loadInitialPattern"></div>
- <br />
+ <br />
- <input type="text" id="field" name="field" value="" /><br />
- <br />
+ <input type="text" id="field" name="field" value="" /><br />
+ <br />
- <div style="text-align:center;">
- <tal:block tal:repeat="line view/displayedKeys">
+ <div style="text-align:center;">
+ <tal:block tal:repeat="line view/displayedKeys">
+ <div class="keyrow">
+ <tal:block tal:repeat="keycode line">
+ <div class="key"
+ tal:condition="python:keycode!=32"
+ tal:content="python:chr(keycode)"
+ tal:attributes="id string:key_${keycode}" />
+ <div class="key spacekey"
+ tal:condition="python:keycode==32"
+ tal:attributes="id string:key_${keycode}">
+
+ </div>
+ </tal:block>
+ </div>
+ <br />
+ </tal:block>
<div class="keyrow">
- <tal:block tal:repeat="keycode line">
- <div class="key"
- tal:condition="python:keycode!=32"
- tal:content="python:chr(keycode)"
- tal:attributes="id string:key_${keycode}" />
- <div class="key spacekey"
- tal:condition="python:keycode==32"
- tal:attributes="id string:key_${keycode}">
-
- </div>
- </tal:block>
- </div>
- <br />
- </tal:block>
- <div class="keyrow">
- <div class="key" id="key_16">
- Shift
+ <div class="key" id="key_16">
+ Shift
+ </div>
</div>
</div>
- </div>
+
+ </form>
</body>
</html>
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 Wed Jan 23 11:34:36 2008
@@ -108,13 +108,17 @@
keycode = 32
return self.keydown(keycode)
- def mouseup(self, content):
+ def mouseup(self, content, fieldValue):
if content.strip()=='Shift':
return self.render()
try:
keycode = ord(content.strip())
except:
keycode = 32
+ content = ' '
if self.request.SESSION.get('typewriter_shift', False):
self.keyup(16)
+ if keycode in range(97, 97+26) + range(65, 65+26) + [32]:
+ self.getCommandSet('core').setAttribute('input#field', 'value', fieldValue + content)
+ self.getCommandSet('core').focus('input#field')
return self.keyup(keycode)
More information about the Kukit-checkins
mailing list