[KSS-checkins] r49382 - kukit/kss.demo/branch/1.2/kss/demo/demo
reebalazs at codespeak.net
reebalazs at codespeak.net
Wed Dec 5 14:13:33 CET 2007
Author: reebalazs
Date: Wed Dec 5 14:13:32 2007
New Revision: 49382
Modified:
kukit/kss.demo/branch/1.2/kss/demo/demo/demoview.py
kukit/kss.demo/branch/1.2/kss/demo/demo/error_handling.kss
kukit/kss.demo/branch/1.2/kss/demo/demo/error_handling.pt
Log:
Fix error handling demo (backport -r49371:49373 from trunk of kss.core)
Modified: kukit/kss.demo/branch/1.2/kss/demo/demo/demoview.py
==============================================================================
--- kukit/kss.demo/branch/1.2/kss/demo/demo/demoview.py (original)
+++ kukit/kss.demo/branch/1.2/kss/demo/demo/demoview.py Wed Dec 5 14:13:32 2007
@@ -155,7 +155,7 @@
if act == 'error':
raise Exception, 'We have an error here.'
elif act == 'explicit':
- raise KssExplicitError, 'Explicit error raised.'
+ raise KSSExplicitError, 'Explicit error raised.'
elif act == 'empty':
# Just do nothing, we want to return a response with no commands.
# This is valid behaviour, should raise no error, however
Modified: kukit/kss.demo/branch/1.2/kss/demo/demo/error_handling.kss
==============================================================================
--- kukit/kss.demo/branch/1.2/kss/demo/demo/error_handling.kss (original)
+++ kukit/kss.demo/branch/1.2/kss/demo/demo/error_handling.kss Wed Dec 5 14:13:32 2007
@@ -18,17 +18,10 @@
}
*/
-/* The next rule demonstrates that instead of executing a local
- action on the originally selected node, we use executeCommand
- which execute a given local action on a new set of selected nodes.
-*/
-
.handled:click {
- errTest-error: executeCommand;
- executeCommand-commandSelector: 'update-status';
- executeCommand-commandSelectorType: htmlid;
- executeCommand-commandName: replaceInnerHTML;
- executeCommand-html: '<b style="color:red;">Error handler activated.</b>';
+ errTest-error: replaceInnerHTML;
+ replaceInnerHTML-kssSelector: htmlid('update-status');
+ replaceInnerHTML-html: '<b style="color:red;">Error handler activated.</b>';
}
/* Spinner control
Modified: kukit/kss.demo/branch/1.2/kss/demo/demo/error_handling.pt
==============================================================================
--- kukit/kss.demo/branch/1.2/kss/demo/demo/error_handling.pt (original)
+++ kukit/kss.demo/branch/1.2/kss/demo/demo/error_handling.pt Wed Dec 5 14:13:32 2007
@@ -34,29 +34,29 @@
on the server.</p>
<p>The buttons in the first row have no error handled.</p>
<div>
- <input type="submit" id="button_1_1" class="clickable kukit-act-noerror"
+ <input type="submit" id="button_1_1" class="clickable kssattr-act-noerror"
value="No error" />
- <input type="submit" id="button_1_2" class="clickable kukit-act-empty"
+ <input type="submit" id="button_1_2" class="clickable kssattr-act-empty"
value="Empty response" />
- <input type="submit" id="button_1_3" class="clickable kukit-act-error"
+ <input type="submit" id="button_1_3" class="clickable kssattr-act-error"
value="Error" />
- <!--input type="submit" id="button_1_4" class="clickable kukit-act-timeout"
+ <!--input type="submit" id="button_1_4" class="clickable kssattr-act-timeout"
value="Timeout" /-->
- <input type="submit" id="button_2_5" class="clickable kukit-act-explicit"
+ <input type="submit" id="button_2_5" class="clickable kssattr-act-explicit"
value="Explicit error" />
</div>
<p>The buttons in the second row have individual error handlers.</p>
</form>
<div>
- <input type="submit" id="button_2_1" class="clickable handled kukit-act-noerror"
+ <input type="submit" id="button_2_1" class="clickable handled kssattr-act-noerror"
value="No error" />
- <input type="submit" id="button_2_2" class="clickable handled kukit-act-empty"
+ <input type="submit" id="button_2_2" class="clickable handled kssattr-act-empty"
value="Empty response" />
- <input type="submit" id="button_2_3" class="clickable handled kukit-act-error"
+ <input type="submit" id="button_2_3" class="clickable handled kssattr-act-error"
value="Error" />
- <!--input type="submit" id="button_2_4" class="clickable handled kukit-act-timeout"
+ <!--input type="submit" id="button_2_4" class="clickable handled kssattr-act-timeout"
value="Timeout" /-->
- <input type="submit" id="button_2_5" class="clickable handled kukit-act-explicit"
+ <input type="submit" id="button_2_5" class="clickable handled kssattr-act-explicit"
value="Explicit error" />
</div>
<p>
More information about the Kukit-checkins
mailing list