Mercurial > repos > adam-novak > hexagram
changeset 7:a9bf691d4713 draft
Uploaded
| author | adam-novak |
|---|---|
| date | Fri, 18 Oct 2013 18:56:52 -0400 |
| parents | 740c9df2ffe8 |
| children | 0e9f7c8a85bb |
| files | hexagram/hexagram.html~ hexagram/hexagram.js hexagram/hexagram.js~ |
| diffstat | 3 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hexagram/hexagram.html~ Fri Oct 18 18:40:35 2013 -0400 +++ b/hexagram/hexagram.html~ Fri Oct 18 18:56:52 2013 -0400 @@ -33,13 +33,12 @@ <div id="browse-holder"> <input id="search" type="hidden"/> <img src="statistics.svg" id="recalculate-statistics" title="Enrich Attributes"/> - <!--<img src="set.svg" id="calculate-set-operation" title="Calculate Set Operation"/>--> + <img src="throbber.svg" class="recalculate-throbber" title="Recalculating..." /> <img src="set.svg" id="set-operation" title="Calculate Set Operation"/> <img src="inflate.svg" id="inflate" title="Inflate Map"/> - <img src="throbber.svg" class="recalculate-throbber" title="Recalculating..." /> </div> <div id="layout-holder"> - <input id="layout-search" type="hidden"/> + <select id="layout-search" type="hidden"/> </div> </div> <div id="current-layout">Current Layout:</div>
--- a/hexagram/hexagram.js Fri Oct 18 18:40:35 2013 -0400 +++ b/hexagram/hexagram.js Fri Oct 18 18:56:52 2013 -0400 @@ -3746,7 +3746,8 @@ if(layout_names.length == 1) { // This is the very first layout. Pull it up. - $("#layout-search").select2("val", layout_names[0]); + $("#layout-search").select2("data", {id: default_layout, + text: default_layout}); } } }, "text");
--- a/hexagram/hexagram.js~ Fri Oct 18 18:40:35 2013 -0400 +++ b/hexagram/hexagram.js~ Fri Oct 18 18:56:52 2013 -0400 @@ -3743,6 +3743,12 @@ } // Add layout names to global array of names layout_names.push(label); + + if(layout_names.length == 1) { + // This is the very first layout. Pull it up. + $("#layout-search").select2("data", {id: default_layout, + text: default_layout}); + } } }, "text");