Skip to content
This repository has been archived by the owner on Nov 21, 2019. It is now read-only.

Commit

Permalink
Release: v3.9.9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@tayvano
tayvano committed Jul 13, 2017
1 parent d2dc137 commit 6237f22
Show file tree
Hide file tree
Showing 15 changed files with 3,830 additions and 614 deletions.
5 changes: 2 additions & 3 deletions app/includes/header.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@

<link rel="stylesheet" href="css/etherwallet-master.min.css">
<script type="text/javascript" src="js/etherwallet-static.min.js"></script>
@@if (production) { <script type="text/javascript" src="js/etherwallet-master.min.js"></script> }
@@if (!production) { <script type="text/javascript" src="js/etherwallet-master.js"></script> }
<script type="text/javascript" src="js/etherwallet-master.js"></script>

<link rel="apple-touch-icon" sizes="180x180" href="images/fav/apple-touch-icon.png">
<link rel="icon" type="image/png" href="images/fav/favicon-32x32.png" sizes="32x32">
Expand Down Expand Up @@ -56,7 +55,7 @@
}
<div class="tagline">

<span>v3.9.9</span>
<span>v3.9.9.1</span>

<span class="dropdown dropdown-lang" ng-cloak>
<a tabindex="0" aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle btn btn-white" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>
Expand Down
2 changes: 1 addition & 1 deletion app/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MyEtherWallet CX",
"version": "3.9.9",
"version": "3.9.9.1",
"manifest_version": 2,
"description": "MyEtherWallet Chrome Extension",
"homepage_url": "https://www.myetherwallet.com/",
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MyEtherWallet",
"version": "3.9.9",
"version": "3.9.9.1",
"description": "An NPM dist of MyEtherWallet. For easier downloading & updating via CLI.",
"author": "MyEtherWallet",
"license": "ISC",
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/controllers/tabsCtrl.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ var tabsCtrl = function($scope, globalService, $translate, $sce) {
$scope.notifier.danger(globalFuncs.errorMsgs[32]);
} else {
$scope.nodeIsConnected = true;
$scope.notifier.info(globalFuncs.successMsgs[5] + 'to the <strong>' + $scope.nodeType + ' node</strong>, provided by <strong>' + $scope.nodeService + '</strong>. You accessing via: <strong>' + window.location.href + '</strong>.')
$scope.notifier.info(globalFuncs.successMsgs[5] + 'to the <strong>' + $scope.nodeType + ' node</strong>, provided by <strong>' + $scope.nodeService + '</strong>. You are accessing via: <strong>' + window.location.href + '</strong>.')
}
});
}
Expand Down
5 changes: 2 additions & 3 deletions chrome-extension/cx-wallet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@

<link rel="stylesheet" href="css/etherwallet-master.min.css">
<script type="text/javascript" src="js/etherwallet-static.min.js"></script>
<script type="text/javascript" src="js/etherwallet-master.min.js"></script>

<script type="text/javascript" src="js/etherwallet-master.js"></script>

<link rel="apple-touch-icon" sizes="180x180" href="images/fav/apple-touch-icon.png">
<link rel="icon" type="image/png" href="images/fav/favicon-32x32.png" sizes="32x32">
Expand Down Expand Up @@ -52,7 +51,7 @@

<div class="tagline">

<span>v3.9.9</span>
<span>v3.9.9.1</span>

<span class="dropdown dropdown-lang" ng-cloak>
<a tabindex="0" aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle btn btn-white" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>
Expand Down
5 changes: 2 additions & 3 deletions chrome-extension/helpers.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@

<link rel="stylesheet" href="css/etherwallet-master.min.css">
<script type="text/javascript" src="js/etherwallet-static.min.js"></script>
<script type="text/javascript" src="js/etherwallet-master.min.js"></script>

<script type="text/javascript" src="js/etherwallet-master.js"></script>

<link rel="apple-touch-icon" sizes="180x180" href="images/fav/apple-touch-icon.png">
<link rel="icon" type="image/png" href="images/fav/favicon-32x32.png" sizes="32x32">
Expand Down Expand Up @@ -45,7 +44,7 @@

<div class="tagline">

<span>v3.9.9</span>
<span>v3.9.9.1</span>

<span class="dropdown dropdown-lang" ng-cloak>
<a tabindex="0" aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle btn btn-white" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>
Expand Down
4 changes: 2 additions & 2 deletions chrome-extension/js/etherwallet-master.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2650,7 +2650,7 @@ var tabsCtrl = function tabsCtrl($scope, globalService, $translate, $sce) {
$scope.notifier.danger(globalFuncs.errorMsgs[32]);
} else {
$scope.nodeIsConnected = true;
$scope.notifier.info(globalFuncs.successMsgs[5] + 'to the <strong>' + $scope.nodeType + ' node</strong>, provided by <strong>' + $scope.nodeService + '</strong>. You accessing via: <strong>' + window.location.href + '</strong>.');
$scope.notifier.info(globalFuncs.successMsgs[5] + 'to the <strong>' + $scope.nodeType + ' node</strong>, provided by <strong>' + $scope.nodeService + '</strong>. You are accessing via: <strong>' + window.location.href + '</strong>.');
}
});
};
Expand Down Expand Up @@ -19295,7 +19295,7 @@ uiFuncs.notifier = {
this.addAlert("success", msg, duration);
},
addAlert: function addAlert(type, msg, duration) {
if (duration == undefined) duration = 6000;
if (duration == undefined) duration = 5000;
// Save all messages by unique id for removal
var id = Date.now();
alert = this.buildAlert(id, type, msg);
Expand Down
2 changes: 1 addition & 1 deletion chrome-extension/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MyEtherWallet CX",
"version": "3.9.9",
"version": "3.9.9.1",
"manifest_version": 2,
"description": "MyEtherWallet Chrome Extension",
"homepage_url": "https://www.myetherwallet.com/",
Expand Down
5 changes: 2 additions & 3 deletions dist/helpers.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@

<link rel="stylesheet" href="css/etherwallet-master.min.css">
<script type="text/javascript" src="js/etherwallet-static.min.js"></script>
<script type="text/javascript" src="js/etherwallet-master.min.js"></script>

<script type="text/javascript" src="js/etherwallet-master.js"></script>

<link rel="apple-touch-icon" sizes="180x180" href="images/fav/apple-touch-icon.png">
<link rel="icon" type="image/png" href="images/fav/favicon-32x32.png" sizes="32x32">
Expand Down Expand Up @@ -45,7 +44,7 @@

<div class="tagline">

<span>v3.9.9</span>
<span>v3.9.9.1</span>

<span class="dropdown dropdown-lang" ng-cloak>
<a tabindex="0" aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle btn btn-white" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>
Expand Down
5 changes: 2 additions & 3 deletions dist/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@

<link rel="stylesheet" href="css/etherwallet-master.min.css">
<script type="text/javascript" src="js/etherwallet-static.min.js"></script>
<script type="text/javascript" src="js/etherwallet-master.min.js"></script>

<script type="text/javascript" src="js/etherwallet-master.js"></script>

<link rel="apple-touch-icon" sizes="180x180" href="images/fav/apple-touch-icon.png">
<link rel="icon" type="image/png" href="images/fav/favicon-32x32.png" sizes="32x32">
Expand Down Expand Up @@ -45,7 +44,7 @@

<div class="tagline">

<span>v3.9.9</span>
<span>v3.9.9.1</span>

<span class="dropdown dropdown-lang" ng-cloak>
<a tabindex="0" aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle btn btn-white" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>
Expand Down
4 changes: 2 additions & 2 deletions dist/js/etherwallet-master.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2650,7 +2650,7 @@ var tabsCtrl = function tabsCtrl($scope, globalService, $translate, $sce) {
$scope.notifier.danger(globalFuncs.errorMsgs[32]);
} else {
$scope.nodeIsConnected = true;
$scope.notifier.info(globalFuncs.successMsgs[5] + 'to the <strong>' + $scope.nodeType + ' node</strong>, provided by <strong>' + $scope.nodeService + '</strong>. You accessing via: <strong>' + window.location.href + '</strong>.');
$scope.notifier.info(globalFuncs.successMsgs[5] + 'to the <strong>' + $scope.nodeType + ' node</strong>, provided by <strong>' + $scope.nodeService + '</strong>. You are accessing via: <strong>' + window.location.href + '</strong>.');
}
});
};
Expand Down Expand Up @@ -19295,7 +19295,7 @@ uiFuncs.notifier = {
this.addAlert("success", msg, duration);
},
addAlert: function addAlert(type, msg, duration) {
if (duration == undefined) duration = 6000;
if (duration == undefined) duration = 5000;
// Save all messages by unique id for removal
var id = Date.now();
alert = this.buildAlert(id, type, msg);
Expand Down
2 changes: 1 addition & 1 deletion dist/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MyEtherWallet",
"version": "3.9.9",
"version": "3.9.9.1",
"description": "An NPM dist of MyEtherWallet. For easier downloading & updating via CLI.",
"author": "MyEtherWallet",
"license": "ISC",
Expand Down
119 changes: 48 additions & 71 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ const source = require('vinyl-source-stream');
const uglify = require('gulp-uglify');
const zip = require('gulp-zip');
const html2js = require('html2js-browserify');
const gulpif = require('gulp-if');

const app = './app/';
const dist = './dist/';
Expand Down Expand Up @@ -61,31 +60,13 @@ function notifyFunc(msg) {
let htmlFiles = app + 'layouts/*.html';
let tplFiles = app + 'includes/*.tpl';

function bundle_html(options) {
options = Object.assign({
production: false,
}, options);

return gulp.src(htmlFiles)
.pipe(plumber({ errorHandler: onError }))
.pipe(fileinclude({
prefix: '@@',
basepath: '@file',
context: {
production: options.production,
},
}))
.pipe(gulp.dest(dist))
.pipe(gulp.dest(dist_CX))
.pipe(notify(onSuccess('HTML')));
}

gulp.task('html', function() {
bundle_html();
});

gulp.task('html-production', function() {
bundle_html({ production: true });
gulp.task('html', function(done) {
return gulp.src(htmlFiles)
.pipe(plumber({ errorHandler: onError }))
.pipe(fileinclude({ prefix: '@@', basepath: '@file' }))
.pipe(gulp.dest(dist))
.pipe(gulp.dest(dist_CX))
.pipe(notify(onSuccess('HTML')))
});


Expand Down Expand Up @@ -120,51 +101,49 @@ let js_srcFile = app + 'scripts/main.js';
let js_destFolder = dist + 'js/';
let js_destFolder_CX = dist_CX + 'js/';
let js_destFile = 'etherwallet-master.js';
let js_destFileMin = 'etherwallet-master.min.js';

function bundle_js(options) {
options = Object.assign({
destFile: js_destFile,
debug: false,
production: false,
}, options || {});
let browseOpts = { debug: true }; // generates inline source maps - only in js-debug
let babelOpts = {
presets: ['es2015'],
compact: false,
global: true
};

const browserifyOpts = {
debug: options.debug,
};
function bundle_js(bundler) {
return bundler.bundle()
.pipe(plumber({ errorHandler: onError }))
.pipe(source('main.js'))
.pipe(buffer())
.pipe(rename(js_destFile))
.pipe(gulp.dest(js_destFolder))
.pipe(gulp.dest(js_destFolder_CX))
.pipe(notify(onSuccess('JS')))
}

const babelOpts = {
presets: ['es2015'],
global: true,
compact: options.production,
};

const bundler = browserify(js_srcFile, browserifyOpts)
.transform(babelify, babelOpts)
.transform(html2js);

return bundler.bundle()
.pipe(plumber({ errorHandler: onError }))
.pipe(source('main.js'))
.pipe(buffer())
.pipe(gulpif(options.production, uglify()))
.pipe(rename(options.production ? js_destFileMin : js_destFile))
.pipe(gulp.dest(js_destFolder))
.pipe(gulp.dest(js_destFolder_CX))
.pipe(notify(onSuccess('JS')));
function bundle_js_debug(bundler) {
return bundler.bundle()
.pipe(plumber({ errorHandler: onError }))
.pipe(source('main.js'))
.pipe(buffer())
.pipe(rename(js_destFile))
.pipe(gulp.dest(js_destFolder))
.pipe(gulp.dest(js_destFolder_CX))
.pipe(notify(onSuccess('JS')))
}


gulp.task('js', function() {
return bundle_js();
let bundler = browserify(js_srcFile).transform(babelify).transform(html2js);
bundle_js(bundler)
});

gulp.task('js-production', function() {
return bundle_js({ production: true });
let bundler = browserify(js_srcFile).transform(babelify, babelOpts).transform(html2js);
bundle_js(bundler)
});

gulp.task('js-debug', function() {
return bundle_js({ debug: true });
let bundler = browserify(js_srcFile, browseOpts).transform(babelify, babelOpts).transform(html2js);
bundle_js_debug(bundler)
});


Expand Down Expand Up @@ -398,32 +377,30 @@ gulp.task('pushlive', ['getVersion'], function() {
// git push --tags
// gulp pushlive ( git subtree push --prefix dist origin gh-pages )

gulp.task('watchJS', function() { gulp.watch(js_watchFolder, ['js'] ) })
gulp.task('watchJSDebug', function() { gulp.watch(js_watchFolder, ['js-debug'] ) })
gulp.task('watchJSProd', function() { gulp.watch(js_watchFolder, ['js-production'] ) })
gulp.task('watchLess', function() { gulp.watch(less_watchFolder, ['styles'] ) })
gulp.task('watchPAGES', function() { gulp.watch(htmlFiles, ['html'] ) })
gulp.task('watchPAGESProd', function() { gulp.watch(htmlFiles, ['html-production'] ) })
gulp.task('watchTPL', function() { gulp.watch(tplFiles, ['html'] ) })
gulp.task('watchTPLProd', function() { gulp.watch(tplFiles, ['html-production'] ) })
gulp.task('watchCX', function() { gulp.watch(cxSrcFiles, ['copy'] ) })
gulp.task('watchJS', function() { gulp.watch(js_watchFolder, ['js'] ) })
gulp.task('watchJSDebug', function() { gulp.watch(js_watchFolder, ['js-debug'] ) })
gulp.task('watchJSProd', function() { gulp.watch(js_watchFolder, ['js-production'] ) })
gulp.task('watchLess', function() { gulp.watch(less_watchFolder, ['styles'] ) })
gulp.task('watchPAGES', function() { gulp.watch(htmlFiles, ['html'] ) })
gulp.task('watchTPL', function() { gulp.watch(tplFiles, ['html'] ) })
gulp.task('watchCX', function() { gulp.watch(cxSrcFiles, ['copy'] ) })

gulp.task('bump', function() { return bumpFunc( 'patch' ) });
gulp.task('bump-patch', function() { return bumpFunc( 'patch' ) });
gulp.task('bump-minor', function() { return bumpFunc( 'minor' ) });

gulp.task('archive', function() { return archive() });

gulp.task('prep', function(cb) { runSequence('js-production', 'html-production', 'styles', 'copy', cb); });
gulp.task('prep', function(cb) { runSequence('js-production', 'html', 'styles', 'copy', cb); });

gulp.task('bump', function(cb) { runSequence('bump-patch', 'clean', 'zip', cb); });

gulp.task('zipit', function(cb) { runSequence('clean', 'zip', cb); });

gulp.task('commit', function(cb) { runSequence('add', 'commitV', 'tag', cb); });

gulp.task('watch', ['watchJS', 'watchLess', 'watchPAGES', 'watchTPL', 'watchCX'])
gulp.task('watchProd', ['watchJSProd', 'watchLess', 'watchPAGESProd', 'watchTPLProd', 'watchCX'])
gulp.task('watch', ['watchJS', 'watchLess', 'watchPAGES', 'watchTPL', 'watchCX'])
gulp.task('watchProd', ['watchJSProd', 'watchLess', 'watchPAGES', 'watchTPL', 'watchCX'])

gulp.task('build', ['js', 'html', 'styles', 'copy']);
gulp.task('build-debug', ['js-debug', 'html', 'styles', 'watchJSDebug', 'watchLess', 'watchPAGES', 'watchTPL', 'watchCX'])
Expand Down
Loading

0 comments on commit 6237f22

Please sign in to comment.