From 207b297d37ae9757b6e0829a9bcf1cd18751d559 Mon Sep 17 00:00:00 2001 From: davidferguson Date: Sun, 28 Aug 2016 22:59:47 +0100 Subject: [PATCH] fixed import recipe code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The importing recipe code previously changed the write mode to upload when a recipe was imported. This update makes PiBakery use whatever mode it’s currently in, so you can write and update using recipes. Also incremented version number to reflect change. --- app/pibakery.js | 7 +------ package.json | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/pibakery.js b/app/pibakery.js index 191de1f..fb34ef3 100755 --- a/app/pibakery.js +++ b/app/pibakery.js @@ -2296,11 +2296,6 @@ function importRecipe (openPath) { workspace.updateToolbox(document.getElementById('toolbox')) Blockly.Xml.domToWorkspace(Blockly.Xml.textToDom(data), workspace) - document.getElementById('flashSD').removeEventListener('click', writeToSd) - document.getElementById('flashSD').addEventListener('click', updateSd) - document.getElementById('flashSD').children[1].innerText = 'Update' - document.getElementById('sdImage').src = 'img/update-sd.png' - currentMode = 'update' }) } } @@ -2362,7 +2357,7 @@ function bashEscape (arg) { } // Used to support drag-and-drop files onto PiBakery. XML files will be opened -// as PiBakery recipies, and folders will be imported as temporary blocks +// as PiBakery recipes, and folders will be imported as temporary blocks document.ondragover = document.ondrop = (ev) => { ev.preventDefault() } diff --git a/package.json b/package.json index af76df8..271517b 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,15 @@ { "name": "PiBakery", "displayName": "PiBakery", - "version": "0.2.2", + "version": "0.2.3", "description": "The blocks based, easy to use setup tool for Raspberry Pi", "main": "./main.js", "author": "David Ferguson ", "license": "GPL-3.0+", "scripts": { "start": "electron .", - "build-mac": "find . -name .DS_Store -depth -exec rm {} \\; && npm dedupe && electron-packager ./ PiBakery --platform=darwin --arch=all --version=1.3.2 --overwrite --prune --app-version=0.2.2 --icon=./app/img/icon.icns", - "build-win": "npm dedupe && electron-packager ./ PiBakery --platform=win32 --arch=ia32 --version=1.3.2 --overwrite --prune --app-version=0.2.2 --icon=./app/img/icon.ico" + "build-mac": "find . -name .DS_Store -depth -exec rm {} \\; && npm dedupe && electron-packager ./ PiBakery --platform=darwin --arch=all --version=1.3.2 --overwrite --prune --app-version=0.2.3 --icon=./app/img/icon.icns", + "build-win": "npm dedupe && electron-packager ./ PiBakery --platform=win32 --arch=ia32 --version=1.3.2 --overwrite --prune --app-version=0.2.3 --icon=./app/img/icon.ico" }, "optionalDependencies": { "elevator": "^1.0.0",