You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/03/07 22:01:30 UTC
[3/3] git commit: Make crx and serve "Add" view use the same
textboxes.
Make crx and serve "Add" view use the same textboxes.
Got annoyed when I switched between the two and the box got cleared.
Project: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/commit/6667ea07
Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/6667ea07
Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/6667ea07
Branch: refs/heads/master
Commit: 6667ea07800ce3a0161d0422bcdc7ec5213cb3ae
Parents: 63e0c39
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Mar 7 16:00:39 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Mar 7 16:00:39 2014 -0500
----------------------------------------------------------------------
www/cdvah/views/add.html | 50 ++++++++++++++++++++++---------------------
1 file changed, 26 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/6667ea07/www/cdvah/views/add.html
----------------------------------------------------------------------
diff --git a/www/cdvah/views/add.html b/www/cdvah/views/add.html
index a26f4d0..d0275ac 100644
--- a/www/cdvah/views/add.html
+++ b/www/cdvah/views/add.html
@@ -1,35 +1,37 @@
<form name="addForm" ng-controller="AddCtrl">
+ <div>
<label ng-show="editing">App name<br />
- <div><input type="text" class="topcoat-text-input" ng-model="appData.appId" autocorrect="off" autocapitalize="on" /></div>
+ <div><input type="text" class="topcoat-text-input" ng-model="appData.appId" autocapitalize="on" /></div>
</label>
+ </div>
+ <div>
<label ng-show="!editing">How to retrieve the app:<br>
<select ng-model="appData.installerType">
<option value="serve">cordova serve</option>
- <option value="cdvh">.cdvh file</option>
<option value="crx">.crx file</option>
</select>
</label>
- <div ng-show="appData.installerType == 'serve'">
- <label>Enter server URL
- <div><input class="topcoat-text-input" style="width:100%;-webkit-box-sizing:border-box" type="text" ng-model="appData.appUrl" autocorrect="off" autocapitalize="off"></div>
- </label>
- <button class="topcoat-button" ng-click="fetchQR(appData, 'appUrl')" ng-show="qrEnabled">QR Code</button>
- <select ng-model="appData.serveTemplateValue" ng-change="selectTemplate()">
- <option value="">Template</option>
- <option value="localhost:8000">localhost</option>
- <option value="KEY.t.proxylocal.com">ProxyLocal</option>
- <option value="KEY.localtunnel.com">LocalTunnel</option>
- </select>
- </div>
- <div ng-show="appData.installerType != 'serve'">
- <label>Enter URL<br>
- <input class="topcoat-text-input" type="text" ng-model="appData.appUrl" autocorrect="off" autocapitalize="off">
- </label>
- <button class="topcoat-button" ng-click="fetchQR(appData, 'appUrl')" ng-show="qrEnabled">Scan QR Code</button><br>
- </div>
- <div class="buttons">
- <button ng-click="addApp()" class="topcoat-button--cta">{{ editing ? 'Edit' : 'Add' }}</button>
- <a href="#/"><button class="topcoat-button" ng-click="back()">Back</button></a>
- </div>
+ </div>
+ <div>
+ <label>Enter URL
+ <div><input class="topcoat-text-input" style="width:100%;-webkit-box-sizing:border-box" type="text" ng-model="appData.appUrl" autocorrect="off" autocapitalize="off"></div>
+ </label>
+ </div>
+ <div>
+ <button class="topcoat-button" ng-click="fetchQR(appData, 'appUrl')" ng-show="qrEnabled">QR Code</button>
+ </div>
+ <div>
+ <select ng-model="appData.serveTemplateValue" ng-change="selectTemplate()">
+ <option value="">Template</option>
+ <option value="goo.gl/">goo.gl</option>
+ <option value="localhost:8000">localhost</option>
+ <option value="KEY.t.proxylocal.com">ProxyLocal</option>
+ <option value="KEY.localtunnel.com">LocalTunnel</option>
+ </select>
+ </div>
+ <div class="buttons">
+ <button ng-click="addApp()" class="topcoat-button--cta">{{ editing ? 'Edit' : 'Add' }}</button>
+ <a href="#/"><button class="topcoat-button" ng-click="back()">Back</button></a>
+ </div>
</form>