Skip to content

Commit

Permalink
fixed import recipe code
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
davidferguson committed Aug 28, 2016
1 parent eb631a7 commit 207b297
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
7 changes: 1 addition & 6 deletions app/pibakery.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
})
}
}
Expand Down Expand Up @@ -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()
}
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -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 <david@pibakery.org>",
"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",
Expand Down

0 comments on commit 207b297

Please sign in to comment.