jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix-experience-edit-inputs'

Browse Source
This commit is contained in:
Stefan Zermatten
2015-06-25 14:07:34 +02:00
parent 946fadadc2 e992aeebef
commit 0996b51a3c
3 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html
View File

@@ -9,20 +9,24 @@
<div class="pre-wrap">{{description}}</div>
{{/if}}
{{else}}
<div horizontal layout>
<!--Name-->
<paper-input id="experienceNameInput" label="Name" floatinglabel value={{name}} flex></paper-input>
<!--Value-->
<paper-input-decorator label="Value" floatinglabel>
<input id="valueInput" type="number" value={{value}}>
</paper-input-decorator>
</div>
<!--Description-->
<paper-input-decorator label="Description" floatinglabel layout vertical>
<paper-autogrow-textarea>
<textarea id="experienceDescriptionInput" placeholder value={{description}}></textarea>
</paper-autogrow-textarea>
</paper-input-decorator>
{{> experienceEdit}}
{{/baseDialog}}
{{/with}}
</template>
</template>
<template name="experienceEdit">
<div horizontal layout>
<!--Name-->
<paper-input id="experienceNameInput" label="Name" floatinglabel value={{name}} flex></paper-input>
<!--Value-->
<paper-input-decorator label="Value" floatinglabel>
<input id="valueInput" type="number" value={{value}}>
</paper-input-decorator>
</div>
<!--Description-->
<paper-input-decorator label="Description" floatinglabel layout vertical>
<paper-autogrow-textarea>
<textarea id="experienceDescriptionInput" placeholder value={{description}}></textarea>
</paper-autogrow-textarea>
</paper-input-decorator>
</template>

8
rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js
View File

@@ -1,4 +1,4 @@
Template.experienceDialog.onRendered(function(){
Template.experienceEdit.onRendered(function(){
updatePolymerInputs(this);
});
@@ -22,8 +22,10 @@ Template.experienceDialog.events({
);
GlobalUI.closeDetail();
},
//TODO validate input (integer, non-negative, etc) for these inputs and give validation errors
"change #experienceNameInput, input #experienceNameInput": function(event){
});
Template.experienceEdit.events({
"change #experienceNameInput": function(event){
var value = event.currentTarget.value;
Experiences.update(this._id, {$set: {name: value}});
},

8
rpg-docs/private/changeLogs/changeLogs.js
View File

@@ -183,7 +183,13 @@ ChangeLogs.insert({
"Big performance improvements: loading characters that you've viewed recently and changing effects on characters should be much faster",
"Spell dialogs no longer show their casting time, range, etc. if those fields aren't filled in",
"The settings dialog now has a done button so it can be closed on small devices",
"Experience dialogs should update their edit-mode inputs properly now",
"Container dialogs now have the weight summaries rounded down properly",
],
});
ChangeLogs.insert({
version: "0.6.1",
changes: [
"Experience dialogs should update their edit-mode inputs properly now",
],
});