From d094035f2174ba5b417fe5f1f6c0b3984d636745 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Fri, 15 Dec 2017 17:43:18 -0500 Subject: [PATCH 1/2] fix storage getUrl method override issue --- js/build/embark.bundle.js | 9 ++++++--- js/embark.js | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/js/build/embark.bundle.js b/js/build/embark.bundle.js index 64f45b8c4..dd3c1830c 100644 --- a/js/build/embark.bundle.js +++ b/js/build/embark.bundle.js @@ -43,6 +43,9 @@ return /******/ (function(modules) { // webpackBootstrap /******/ // expose the module cache /******/ __webpack_require__.c = installedModules; /******/ +/******/ // identity function for calling harmony imports with the correct context +/******/ __webpack_require__.i = function(value) { return value; }; +/******/ /******/ // define getter function for harmony exports /******/ __webpack_require__.d = function(exports, name, getter) { /******/ if(!__webpack_require__.o(exports, name)) { @@ -306,10 +309,10 @@ EmbarkJS.Storage.setProvider = function(provider, options) { try { if (options === undefined) { self.ipfsConnection = IpfsApi('localhost', '5001'); - self.getUrl = "http://localhost:8080/ipfs/"; + self._getUrl = "http://localhost:8080/ipfs/"; } else { self.ipfsConnection = IpfsApi(options.server, options.port); - self.getUrl = options.getUrl || "http://localhost:8080/ipfs/"; + self._getUrl = options.getUrl || "http://localhost:8080/ipfs/"; } resolve(self); } catch (err) { @@ -399,7 +402,7 @@ EmbarkJS.Storage.IPFS.uploadFile = function(inputSelector) { }; EmbarkJS.Storage.IPFS.getUrl = function(hash) { - return (self.getUrl || "http://localhost:8080/ipfs/") + hash; + return (self._getUrl || "http://localhost:8080/ipfs/") + hash; }; //========================================================= diff --git a/js/embark.js b/js/embark.js index 1387ef59e..e0b53c5c1 100644 --- a/js/embark.js +++ b/js/embark.js @@ -227,10 +227,10 @@ EmbarkJS.Storage.setProvider = function(provider, options) { try { if (options === undefined) { self.ipfsConnection = IpfsApi('localhost', '5001'); - self.getUrl = "http://localhost:8080/ipfs/"; + self._getUrl = "http://localhost:8080/ipfs/"; } else { self.ipfsConnection = IpfsApi(options.server, options.port); - self.getUrl = options.getUrl || "http://localhost:8080/ipfs/"; + self._getUrl = options.getUrl || "http://localhost:8080/ipfs/"; } resolve(self); } catch (err) { @@ -320,7 +320,7 @@ EmbarkJS.Storage.IPFS.uploadFile = function(inputSelector) { }; EmbarkJS.Storage.IPFS.getUrl = function(hash) { - return (self.getUrl || "http://localhost:8080/ipfs/") + hash; + return (self._getUrl || "http://localhost:8080/ipfs/") + hash; }; //========================================================= From 4008f1591050c9dc8f9bb50befc63da3904f787a Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Fri, 15 Dec 2017 17:44:06 -0500 Subject: [PATCH 2/2] update to 2.6.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a5083d040..a30d6c552 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "embark", - "version": "2.6.1", + "version": "2.6.2", "description": "Embark is a framework that allows you to easily develop and deploy DApps", "scripts": { "test": "grunt jshint && mocha test/ --no-timeouts && cd test_app/ && npm install && ../bin/embark test"