Permalink
Browse files

Update built files (changes per MK review)

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
  • Loading branch information...
1 parent a4a7f98 commit 5276d710cd6d1c31573ed2a06df2260a837aa84e @rwaldron rwaldron committed Aug 8, 2012
Showing with 18 additions and 12 deletions.
  1. +12 −5 dist/application.js
  2. +1 −1 dist/application.min.js
  3. +1 −1 dist/style.css
  4. +4 −5 index.html
View
@@ -13830,9 +13830,16 @@ if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
nodes.devices.innerHTML = templates["devices-tpl"]({
options: (function() {
- return Object.keys( data.results ).map(function( key ) {
- return "<option value='" + key + "'>" + key + "</option>";
- });
+ return [
+ // Show "Your Device" option when _not_ viewing
+ // your device's results
+ Rng.params.device && "<option value='yours'>Your Device</option>",
+
+ // Build other device options
+ Object.keys( data.results ).map(function( key ) {
+ return "<option value='" + key + "'>" + key + "</option>";
+ })
+ ].join("");
}())
});
@@ -13841,8 +13848,8 @@ if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
setTimeout(function() {
nodes.devices.querySelector("select").addEventListener("change", function() {
if ( this.value ) {
- window.location = "/?device=" + encodeURIComponent(this.value);
- // console.log( this.value );
+ window.location = "/" + ( this.value === "yours" ?
+ "" : "?device=" + encodeURIComponent(this.value) );
}
});
}, 0);
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -30,7 +30,7 @@ <h1>ringmark</h1>
<aside class="container">
<span id="rng-view-completed"></span>
- <a href="/about">about ringmark,</a>
+ <a href="/about">ringmark,</a>
<a href="/history">v1.4.0pre</a>
</aside>
@@ -41,10 +41,9 @@ <h1>ringmark</h1>
-->
- <section id="rng-view-adevices" class="container">
- <span class="rng-view-primary-link">Other Devices:</span>
+ <aside id="rng-view-adevices" class="container">
<span id="rng-view-devices"></span>
- </section>
+ </aside>
<!-- <section id="rng-view-devices" class="container hide">
</section>
-->
@@ -67,7 +66,7 @@ <h1>ringmark</h1>
</script>
<script id="devices-tpl" type="text/template">
- <select id="rng-view-sdevices"><option>Choose...</option><%= options %></select>
+ <select id="rng-view-sdevices"><option>Choose a different device</option><%= options %></select>
</script>
<script id="report-tpl" type="text/template">

0 comments on commit 5276d71

Please sign in to comment.