Skip to content

Commit ecffc64

Browse files
unknownunknown
unknown
authored and
unknown
committed
add source text area to UI
1 parent 4c93d7d commit ecffc64

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

web/WebDriverJsDemo.html

+7-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
.ui-keyboard-space {
2222
margin-top: -100px;
2323
}
24+
textarea { width: 100%; border: 1px solid #333; padding: 4px; }
2425
</style>
2526

2627
<!-- jQuery & jQuery UI + theme (required) -->
@@ -51,7 +52,7 @@
5152
<td>
5253
<input name="webPage" type="text" onchange="wd.onWebPageChange()" onkeyup="wd.onWebPageChange()"/>
5354
<input id="getButton" type="button" value="GET" onclick="wd.onGet()"/>
54-
<input id="sourceButton" type="button" value="Source" disabled="true" onclick="wd.onSource()"/>
55+
<input id="sourceButton" type="button" value="Visualize" disabled="true" onclick="wd.onSource()"/>
5556
<input id="screenshotButton" type="button" value="Screenshot" disabled="true" onclick="wd.onScreenshot()"/>
5657
<select id="logsSelect" onmouseup="wd.onLogs(this.options[this.selectedIndex].value)">
5758
<option>Logs</option>
@@ -136,5 +137,9 @@
136137
<input type="submit" value="Quit" onclick="wd.onQuit()"/>
137138
<span id="sessionIdLabel" style="color: gray; float:right;"></span>
138139
</div>
139-
</body>
140+
<div style="margin-top: 20px">
141+
<input id="srcButton" type="button" value="Source" onclick="wd.onPageSource()"/><br>
142+
<textarea name="textarea" rows="15"></textarea>
143+
</div>
144+
</body>
140145
</html>

web/webdriver-app.js

+13
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,19 @@ WebDriverJsController.prototype.onScreenshot = function() {
786786
})
787787
};
788788

789+
WebDriverJsController.prototype.onPageSource = function() {
790+
this.updateDriver();
791+
this.driver.getPageSource().then(function(src) {
792+
//var str = vkbeautify.xml(src, 2);
793+
var str = src;
794+
//console.log("source: " + str);
795+
//data = new Blob([str], {type: 'text/plain'});
796+
//saveAs(data, 'pagesource.log');
797+
var textarea = document.getElementsByName('textarea')[0];
798+
textarea.innerHTML = str;
799+
})
800+
};
801+
789802
WebDriverJsController.prototype.onLogs = function(type) {
790803
if (type === 'Logs')
791804
return;

web/webdriver.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -3770,7 +3770,7 @@ webdriver.Command.prototype.getParameter = function(a) {
37703770
webdriver.Command.prototype.getParameters = function() {
37713771
return this.parameters_
37723772
};
3773-
webdriver.CommandName = {GET_SERVER_STATUS:"getStatus", NEW_SESSION:"newSession", GET_SESSIONS:"getSessions", DESCRIBE_SESSION:"getSessionCapabilities", CLOSE:"close", QUIT:"quit", GET_CURRENT_URL:"getCurrentUrl", GET:"get", GO_BACK:"goBack", GO_FORWARD:"goForward", REFRESH:"refresh", ADD_COOKIE:"addCookie", GET_COOKIE:"getCookie", GET_ALL_COOKIES:"getCookies", DELETE_COOKIE:"deleteCookie", DELETE_ALL_COOKIES:"deleteAllCookies", GET_ACTIVE_ELEMENT:"getActiveElement", FIND_ELEMENT:"findElement", FIND_ELEMENTS:"findElements",
3773+
webdriver.CommandName = {GET_PAGE_SOURCE:"getPageSource", GET_SERVER_STATUS:"getStatus", NEW_SESSION:"newSession", GET_SESSIONS:"getSessions", DESCRIBE_SESSION:"getSessionCapabilities", CLOSE:"close", QUIT:"quit", GET_CURRENT_URL:"getCurrentUrl", GET:"get", GO_BACK:"goBack", GO_FORWARD:"goForward", REFRESH:"refresh", ADD_COOKIE:"addCookie", GET_COOKIE:"getCookie", GET_ALL_COOKIES:"getCookies", DELETE_COOKIE:"deleteCookie", DELETE_ALL_COOKIES:"deleteAllCookies", GET_ACTIVE_ELEMENT:"getActiveElement", FIND_ELEMENT:"findElement", FIND_ELEMENTS:"findElements",
37743774
FIND_CHILD_ELEMENT:"findChildElement", FIND_CHILD_ELEMENTS:"findChildElements", CLEAR_ELEMENT:"clearElement", CLICK_ELEMENT:"clickElement", SEND_KEYS_TO_ELEMENT:"sendKeysToElement", SUBMIT_ELEMENT:"submitElement", GET_CURRENT_WINDOW_HANDLE:"getCurrentWindowHandle", GET_WINDOW_HANDLES:"getWindowHandles", GET_WINDOW_POSITION:"getWindowPosition", SET_WINDOW_POSITION:"setWindowPosition", GET_WINDOW_SIZE:"getWindowSize", SET_WINDOW_SIZE:"setWindowSize", MAXIMIZE_WINDOW:"maximizeWindow", SWITCH_TO_WINDOW:"switchToWindow",
37753775
SWITCH_TO_FRAME:"switchToFrame", GET_PAGE_SOURCE:"getPageSource", GET_TITLE:"getTitle", EXECUTE_SCRIPT:"executeScript", EXECUTE_ASYNC_SCRIPT:"executeAsyncScript", GET_ELEMENT_TEXT:"getElementText", GET_ELEMENT_TAG_NAME:"getElementTagName", IS_ELEMENT_SELECTED:"isElementSelected", IS_ELEMENT_ENABLED:"isElementEnabled", IS_ELEMENT_DISPLAYED:"isElementDisplayed", GET_ELEMENT_LOCATION:"getElementLocation", GET_ELEMENT_LOCATION_IN_VIEW:"getElementLocationOnceScrolledIntoView", GET_ELEMENT_SIZE:"getElementSize",
37763776
GET_ELEMENT_ATTRIBUTE:"getElementAttribute", GET_ELEMENT_VALUE_OF_CSS_PROPERTY:"getElementValueOfCssProperty", ELEMENT_EQUALS:"elementEquals", SCREENSHOT:"screenshot", IMPLICITLY_WAIT:"implicitlyWait", SET_SCRIPT_TIMEOUT:"setScriptTimeout", SET_TIMEOUT:"setTimeout", ACCEPT_ALERT:"acceptAlert", DISMISS_ALERT:"dismissAlert", GET_ALERT_TEXT:"getAlertText", SET_ALERT_TEXT:"setAlertValue", EXECUTE_SQL:"executeSQL", GET_LOCATION:"getLocation", SET_LOCATION:"setLocation", GET_APP_CACHE:"getAppCache", GET_APP_CACHE_STATUS:"getStatus",
@@ -4253,7 +4253,7 @@ webdriver.WebDriver.prototype.getAllWindowHandles = function() {
42534253
return this.schedule(new webdriver.Command(webdriver.CommandName.GET_WINDOW_HANDLES), "WebDriver.getAllWindowHandles()")
42544254
};
42554255
webdriver.WebDriver.prototype.getPageSource = function() {
4256-
return this.schedule(new webdriver.Command(webdriver.CommandName.GET_PAGE_SOURCE), "WebDriver.getAllWindowHandles()")
4256+
return this.schedule(new webdriver.Command(webdriver.CommandName.GET_PAGE_SOURCE), "WebDriver.getPageSource()")
42574257
};
42584258
webdriver.WebDriver.prototype.close = function() {
42594259
return this.schedule(new webdriver.Command(webdriver.CommandName.CLOSE), "WebDriver.close()")
@@ -4687,7 +4687,7 @@ webdriver.http.Executor.COMMAND_MAP_ = function() {
46874687
this.build = function() {
46884688
return a
46894689
}
4690-
}).put(webdriver.CommandName.GET_SERVER_STATUS, b("/status")).put(webdriver.CommandName.NEW_SESSION, a("/session")).put(webdriver.CommandName.GET_SESSIONS, b("/sessions")).put(webdriver.CommandName.DESCRIBE_SESSION, b("/session/:sessionId")).put(webdriver.CommandName.QUIT, c("DELETE", "/session/:sessionId")).put(webdriver.CommandName.CLOSE, c("DELETE", "/session/:sessionId/window")).put(webdriver.CommandName.GET_CURRENT_WINDOW_HANDLE, b("/session/:sessionId/window_handle")).put(webdriver.CommandName.GET_WINDOW_HANDLES,
4690+
}).put(webdriver.CommandName.GET_PAGE_SOURCE, b("/session/:sessionId/source")).put(webdriver.CommandName.GET_SERVER_STATUS, b("/status")).put(webdriver.CommandName.NEW_SESSION, a("/session")).put(webdriver.CommandName.GET_SESSIONS, b("/sessions")).put(webdriver.CommandName.DESCRIBE_SESSION, b("/session/:sessionId")).put(webdriver.CommandName.QUIT, c("DELETE", "/session/:sessionId")).put(webdriver.CommandName.CLOSE, c("DELETE", "/session/:sessionId/window")).put(webdriver.CommandName.GET_CURRENT_WINDOW_HANDLE, b("/session/:sessionId/window_handle")).put(webdriver.CommandName.GET_WINDOW_HANDLES,
46914691
b("/session/:sessionId/window_handles")).put(webdriver.CommandName.GET_CURRENT_URL, b("/session/:sessionId/url")).put(webdriver.CommandName.GET, a("/session/:sessionId/url")).put(webdriver.CommandName.GO_BACK, a("/session/:sessionId/back")).put(webdriver.CommandName.GO_FORWARD, a("/session/:sessionId/forward")).put(webdriver.CommandName.REFRESH, a("/session/:sessionId/refresh")).put(webdriver.CommandName.ADD_COOKIE, a("/session/:sessionId/cookie")).put(webdriver.CommandName.GET_ALL_COOKIES, b("/session/:sessionId/cookie")).put(webdriver.CommandName.DELETE_ALL_COOKIES,
46924692
c("DELETE", "/session/:sessionId/cookie")).put(webdriver.CommandName.DELETE_COOKIE, c("DELETE", "/session/:sessionId/cookie/:name")).put(webdriver.CommandName.FIND_ELEMENT, a("/session/:sessionId/element")).put(webdriver.CommandName.FIND_ELEMENTS, a("/session/:sessionId/elements")).put(webdriver.CommandName.GET_ACTIVE_ELEMENT, a("/session/:sessionId/element/active")).put(webdriver.CommandName.FIND_CHILD_ELEMENT, a("/session/:sessionId/element/:id/element")).put(webdriver.CommandName.FIND_CHILD_ELEMENTS,
46934693
a("/session/:sessionId/element/:id/elements")).put(webdriver.CommandName.CLEAR_ELEMENT, a("/session/:sessionId/element/:id/clear")).put(webdriver.CommandName.CLICK_ELEMENT, a("/session/:sessionId/element/:id/click")).put(webdriver.CommandName.SEND_KEYS_TO_ELEMENT, a("/session/:sessionId/element/:id/value")).put(webdriver.CommandName.SUBMIT_ELEMENT, a("/session/:sessionId/element/:id/submit")).put(webdriver.CommandName.GET_ELEMENT_TEXT, b("/session/:sessionId/element/:id/text")).put(webdriver.CommandName.GET_ELEMENT_TAG_NAME,

0 commit comments

Comments
 (0)