Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties

This commit is contained in:
Artur
2020-02-02 13:31:54 +01:00
259 changed files with 8749 additions and 1498 deletions

File diff suppressed because one or more lines are too long

View File

@@ -1,14 +1,42 @@
<script>
component.exports = {
data: {
upperCaseWrapper(lowercased) {
return lowercased.toUpperCase();
}
}
}
</script>
<ui-display title='Status'>
<ui-section label='Energy'>
<ui-bar min='0' max='{{data.maxEnergy}}' value='{{data.energy}}'>{{Math.fixed(adata.energy)}} Units</ui-bar>
</ui-section>
</ui-display>
{{#if data.recordingRecipe && true}}
<ui-notice>
<span class='fa fa-circle'></span> <span>Recording</span>
</ui-notice>
<ui-display>
<ui-subdisplay>
{{#each data.recordingRecipe: chemical}}
<ui-section label='{{chemical.replace(/\b\w/, upperCaseWrapper)}}'><span>{{adata.recordingRecipe[chemical]}}</span></ui-section>
{{/each}}
</ui-subdisplay>
<ui-section>
<ui-button icon='floppy-o' action='save_recording'>Save</ui-button>
<ui-button icon='ban' action='cancel_recording'>Cancel</ui-button>
</ui-section>
</ui-display>
{{/if}}
<ui-display title='Saved Recipes' button>
<ui-section>
<ui-button icon='plus' action='add_recipe'>Add Recipe</ui-button>
<ui-button icon='minus' action='clear_recipes'>Clear Recipes</ui-button>
{{#each data.recipes}}
<ui-button grid icon='tint' action='dispense_recipe' params='{"recipe": "{{contents}}"}'>{{recipe_name}}</ui-button>
<ui-button icon='plus' action='record_recipe' state='{{data.recordingRecipe ? "disabled" : null}}'>Record Recipe</ui-button>
<ui-button icon='minus' action='clear_recipes' state='{{data.recordingRecipe ? "disabled" : null}}'>Clear Recipes</ui-button>
{{#each data.recipes: recipe_name}}
<ui-button grid icon='tint' action='dispense_recipe' params='{"recipe": "{{recipe_name}}"}'>{{recipe_name}}</ui-button>
{{/each}}
</ui-section>
</ui-display>
@@ -27,7 +55,7 @@
<ui-display title='Beaker' button>
{{#partial button}}
{{#each data.beakerTransferAmounts}}
<ui-button icon='minus' action='remove' params='{"amount": {{.}}}'>{{.}}</ui-button>
<ui-button icon='minus' action='remove' params='{"amount": {{.}}}' state='{{data.recordingRecipe ? "disabled" : null}}'>{{.}}</ui-button>
{{/each}}
<ui-button icon='eject' state='{{data.isBeakerLoaded ? null : "disabled"}}' action='eject'>Eject</ui-button>
{{/partial}}