Commit bc932401 authored by Tony Tam's avatar Tony Tam
Browse files

fixed merge issue

parent 99936758
...@@ -655,7 +655,7 @@ function program13(depth0,data) { ...@@ -655,7 +655,7 @@ function program13(depth0,data) {
function program14(depth0,data) { function program14(depth0,data) {
var buffer = "", stack1; var buffer = "", stack1;
buffer += "\n <option value='"; buffer += "\n <option selected=\"\" value='";
if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); } if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; } else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
buffer += escapeExpression(stack1) buffer += escapeExpression(stack1)
......
This diff is collapsed.
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
{{/if}} {{/if}}
{{#each allowableValues.descriptiveValues}} {{#each allowableValues.descriptiveValues}}
{{#if isDefault}} {{#if isDefault}}
<option value='{{value}}'>{{value}} (default)</option> <option selected="" value='{{value}}'>{{value}} (default)</option>
{{else}} {{else}}
<option value='{{value}}'>{{value}}</option> <option value='{{value}}'>{{value}}</option>
{{/if}} {{/if}}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment