[Checkins] SVN: zc.testbrowser/trunk/src/zc/testbrowser/real. More
functions called via JSFunctionProxy
Justas SadzeviÃÂius
justas at pov.lt
Thu Sep 27 12:09:37 EDT 2007
Log message for revision 80241:
More functions called via JSFunctionProxy
Changed:
U zc.testbrowser/trunk/src/zc/testbrowser/real.js
U zc.testbrowser/trunk/src/zc/testbrowser/real.py
-=-
Modified: zc.testbrowser/trunk/src/zc/testbrowser/real.js
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/real.js 2007-09-27 16:01:16 UTC (rev 80240)
+++ zc.testbrowser/trunk/src/zc/testbrowser/real.js 2007-09-27 16:09:37 UTC (rev 80241)
@@ -314,7 +314,7 @@
}
}
}
- return options.toSource();
+ return options;
}
function tb_get_listcontrol_displayOptions(token) {
@@ -344,7 +344,7 @@
}
}
- return options.toSource();
+ return options;
}
function tb_act_as_single(token) {
@@ -416,7 +416,7 @@
}
}
}
- return values.toSource();
+ return values;
}
function tb_find_labels(elem) {
Modified: zc.testbrowser/trunk/src/zc/testbrowser/real.py
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/real.py 2007-09-27 16:01:16 UTC (rev 80240)
+++ zc.testbrowser/trunk/src/zc/testbrowser/real.py 2007-09-27 16:09:37 UTC (rev 80241)
@@ -496,16 +496,11 @@
@apply
def value():
def fget(self):
- options = self.browser.execute(
- 'tb_get_listcontrol_value(%r)' % self.token)
-
- v = [option for option in simplejson.loads(options)]
-
+ values = self.browser.js.tb_get_listcontrol_value(self.token)
if self.acts_as_single:
- return v[0]
+ return values[0]
+ return values
- return v
-
def fset(self, value):
if self._browser_counter != self.browser._counter:
raise zc.testbrowser.interfaces.ExpiredError
@@ -517,23 +512,18 @@
#raise NotImplementedError
else:
# expects a list of control ids
- self.browser.execute(
- 'tb_set_listcontrol_value(%r, %s)' % (
- self.token, simplejson.dumps(value)) )
+ self.browser.js.tb_set_listcontrol_value(self.token, value)
return property(fget, fset)
@property
def displayOptions(self):
- options = self.browser.execute(
- 'tb_get_listcontrol_displayOptions(%r)' % self.token)
- return [str(option) for option in simplejson.loads(options)]
+ return [str(option) for option in
+ self.browser.js.tb_get_listcontrol_displayOptions(self.token)]
@property
def options(self):
- options = self.browser.execute(
- 'tb_get_listcontrol_options(%r)' % self.token)
- return [option for option in simplejson.loads(options)]
+ return self.browser.js.tb_get_listcontrol_options(self.token)
@property
def controls(self):
More information about the Checkins
mailing list