diff --git a/hooks/after_prepare/ionic-minify.js b/hooks/after_prepare/ionic-minify.js index ebd25fe2e164be1d06f57ed49496889d25d63ff1..1ab2576cd51a7c363429ad9d59e3c966ab89aff9 100755 --- a/hooks/after_prepare/ionic-minify.js +++ b/hooks/after_prepare/ionic-minify.js @@ -1,4 +1,5 @@ #!/usr/bin/env node +"use strict"; var path = require("path"); var ionic_minify_1 = require("ionic-minify"); var config = require("../minify-conf.json"); @@ -7,13 +8,12 @@ var cmd = process.env.CORDOVA_CMDLINE; var rootDir = process.argv[2]; var platforms = process.env.CORDOVA_PLATFORMS.split(','); var platformPath = path.join(rootDir, "platforms"); -if (cmd.indexOf("--release") > -1) { - console.log("WARN: The use of the --release flag is deprecated!! Use --minify instead!"); +if (cmd.indexOf("--release") > -1 || cmd.indexOf("--minify") > -1) { + if (cmd.indexOf("--release") > -1) { + console.log("WARN: The use of the --release flag is deprecated!! Use --minify instead!"); + } minify = true; } -else { - minify = (cmd.indexOf("--minify") > -1); -} config.showErrStack = (config.showErrStack || false); config.jsOptions.fromString = true; if (minify === true) { diff --git a/www/js/controllers/currency-controllers.js b/www/js/controllers/currency-controllers.js index 9a416e9cecc337d1cce2ceefc535f2c3b13f49ae..a2f384746751c52b4852673599db3e23288bae49 100644 --- a/www/js/controllers/currency-controllers.js +++ b/www/js/controllers/currency-controllers.js @@ -53,7 +53,7 @@ angular.module('cesium.currency.controllers', ['cesium.services']) ; -function CurrencyLookupController($scope, $state, $q, $timeout, UIUtils, APP_CONFIG, BMA, Registry, ionicMaterialInk) { +function CurrencyLookupController($scope, $state, $q, $timeout, UIUtils, APP_CONFIG, BMA, Registry) { $scope.selectedCurrency = ''; $scope.knownCurrencies = []; @@ -68,7 +68,7 @@ function CurrencyLookupController($scope, $state, $q, $timeout, UIUtils, APP_CON $scope.selectedCurrency = res[0].id; } // Set Ink - ionicMaterialInk.displayEffect({selector: 'a.item'}); + UIUtils.ink({selector: 'a.item'}); }); }); diff --git a/www/js/controllers/registry-controllers.js b/www/js/controllers/registry-controllers.js index ccdaaa0a1d93bbebe4d519d6dfb90c7f9ee73418..22f9910a24ddd7a842eac3739d37b5b2b43a8ed5 100644 --- a/www/js/controllers/registry-controllers.js +++ b/www/js/controllers/registry-controllers.js @@ -304,7 +304,7 @@ function RegistryLookupController($scope, $state, $ionicModal, $focus, $q, $time */ } -function RegistryRecordViewController($scope, $ionicModal, Wallet, Registry, UIUtils, $state, CryptoUtils, $q, BMA, ionicMaterialInk) { +function RegistryRecordViewController($scope, $ionicModal, Wallet, Registry, UIUtils, $state, CryptoUtils, $q, BMA) { $scope.formData = {}; $scope.id = null; @@ -407,7 +407,7 @@ function RegistryRecordViewController($scope, $ionicModal, Wallet, Registry, UIU } -function RegistryRecordEditController($scope, $ionicModal, Wallet, Registry, UIUtils, $state, CryptoUtils, $q, $ionicPopup, $translate, ionicMaterialInk, System) { +function RegistryRecordEditController($scope, $ionicModal, Wallet, Registry, UIUtils, $state, CryptoUtils, $q, $ionicPopup, $translate, System) { RegistryCategoryModalController.call(this, $scope, Registry, $state, $ionicModal, UIUtils); diff --git a/www/js/controllers/wallet-controllers.js b/www/js/controllers/wallet-controllers.js index 05fca334ac0ecb921010082b65e2f8ed85bca358..97bc2b611c6648ab0d335e7ffa3f2f16cde96b16 100644 --- a/www/js/controllers/wallet-controllers.js +++ b/www/js/controllers/wallet-controllers.js @@ -20,7 +20,6 @@ angular.module('cesium.wallet.controllers', ['cesium.services', 'cesium.currency ; function WalletController($scope, $state, $q, $ionicPopup, $ionicActionSheet, $timeout, - ionicMaterialMotion, ionicMaterialInk, UIUtils, Wallet, BMA, $translate, Registry) { $scope.walletData = {}; @@ -82,11 +81,11 @@ function WalletController($scope, $state, $q, $ionicPopup, $ionicActionSheet, $t $scope.isMember = !$scope.needSelf && !$scope.needMembership; // Set Motion $timeout(function() { - ionicMaterialMotion.fadeSlideInRight({ + UIUtils.motion.fadeSlideInRight({ startVelocity: 3000 }); // Set Ink - ionicMaterialInk.displayEffect({selector: '.item'}); + UIUtils.ink({selector: '.item'}); }, 10); };