Skip to content

Commit

Permalink
Merge pull request #7 from entrylabs/hotfix/1.0.6
Browse files Browse the repository at this point in the history
1.0.6 대응
  • Loading branch information
kimorkim committed Mar 14, 2016
2 parents ffa2c93 + 1309f69 commit 11c8adf
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build/entry.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
Name "엔트리"

; The file to write
OutFile "Entry_1.0.5_Setup.exe"
OutFile "Entry_1.0.6_Setup.exe"

; The default installation directory
InstallDir "C:\Entry"
Expand Down
4 changes: 2 additions & 2 deletions entry/controllers/workspace.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ angular.module('workspace').controller("WorkspaceController",
$scope.setOfflineHW = function() {
$('#entryCategoryarduino').mouseup(function() {
Entry.HW.prototype.downloadConnector = function() {
$('#saveArduinoPlugin').attr('nwsaveas', 'Entry_HW_v1.1.2.exe').trigger('click');
$('#saveArduinoPlugin').attr('nwsaveas', 'Entry_HW_v1.1.3.exe').trigger('click');
$("#saveArduinoPlugin").on("change", function () {
var filePath = $('#saveArduinoPlugin').val();
if (filePath !== "") {
var fs = require("fs");
fs.readFile("./hardware/plugin/Entry_HW_v1.1.2.exe", function (err, stream) {
fs.readFile("./hardware/plugin/Entry_HW_v1.1.3.exe", function (err, stream) {
fs.writeFile(filePath, stream, 'utf8', function (err) {
if (err)
alert("Unable to save file");
Expand Down
Binary file added entry/media/handclosed.cur
Binary file not shown.
2 changes: 1 addition & 1 deletion entry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "git",
"url": "https://github.com/boolgom/entry-offline.git"
},
"version": "1.0.5",
"version": "1.0.6",
"chromium-args": "--disable-web-security --allow-file-access-from-files --enable-decoder=aac,h264,mp3 --enable-demuxer=mp3,mov --enable-parser=aac,h264,mpegaudio",
"window": {
"toolbar": false,
Expand Down

0 comments on commit 11c8adf

Please sign in to comment.