Skip to content

Commit

Permalink
Bumped version number
Browse files Browse the repository at this point in the history
  • Loading branch information
davidhealey committed Nov 27, 2018
1 parent ab1f4ce commit 252015d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.waist.line" version="2.3.7" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="com.waist.line" version="2.3.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Waistline</name>
<description>
A libre calorie counter including a barcode scanner linked to the Open Food Facts database.
Expand Down
4 changes: 2 additions & 2 deletions www/activities/diary/js/diary.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ var diary = {
$("#edit-diary-item #data").attr("data", JSON.stringify(data)); //Add data to form for access by other functions
$("#edit-diary-item #name i").html(unescape(data.name) + " - " + unescape(data.portion));
if (data.brand) $("#edit-diary-item #brand").html(unescape(data.brand));
$("#edit-diary-item #portion").val(parseFloat(data.portion));
$("#edit-diary-item #unit").val(data.portion.replace(/[^a-z]/gi, ''));
//$("#edit-diary-item #portion").val(parseFloat(data.portion));
//$("#edit-diary-item #unit").val(data.portion.replace(/[^a-z]/gi, ''));
$("#edit-diary-item #quantity").val(data.quantity);

for (n in data.nutrition)
Expand Down
4 changes: 2 additions & 2 deletions www/activities/diary/views/edit-item.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ <h4 id="name"><i></i></h4>
<input type="hidden" id="data"><!--Used for storing other data so that it can be accessed by other functions-->

<p><ons-input type="number" id="quantity" step="any" required="true" placeholder="Quantity" float value="1"></ons-input></p>
<ons-row>
<!--<ons-row>
<ons-col style="padding-right:0.25em;"><ons-input type="number" min="1" inputmode="decimal" step="any" name="portion" id="portion" required="true" placeholder="Portion*" float value="1" onfocus="this.oldValue = this.value;"></ons-input></ons-col>
<ons-col style="padding-left:0.25em;"><ons-input type="text" pattern="[A-Za-z]*" name="unit" id="unit" required="true" placeholder="Unit*" float readonly></ons-input></ons-col>
<ons-col></ons-col>
</ons-row>
</ons-row>-->
<p><ons-input type="number" id="calories" step="any" placeholder="Calories" float readonly value="0"></ons-input></p>
<p><ons-input type="number" id="fat" step="any" placeholder="Fat (g)" float readonly value="0"></ons-input></p>
<p><ons-input type="number" id="saturated-fat" step="any" placeholder="Saturated Fat(g)" float readonly value="0"></ons-input></p>
Expand Down

0 comments on commit 252015d

Please sign in to comment.