anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5071 from gabrielbazan7/fix/feedback06

Browse source 
remove skipped from send feedback controller
This commit is contained in:
Jason Dreyzehner 2016-11-17 12:56:25 -05:00 • committed by GitHub
commit 3b9838ff82
2 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/js/controllers/feedback/send.js
View file

@ -2,22 +2,22 @@
angular.module('copayApp.controllers').controller('sendController', function($scope, $state, $log, $timeout, $stateParams, $ionicNavBarDelegate, $ionicHistory, $ionicConfig, $window, gettextCatalog, popupService, configService, lodash, feedbackService, ongoingProcess) { angular.module('copayApp.controllers').controller('sendController', function($scope, $state, $log, $timeout, $stateParams, $ionicNavBarDelegate, $ionicHistory, $ionicConfig, $window, gettextCatalog, popupService, configService, lodash, feedbackService, ongoingProcess) {
$scope.sendFeedback = function(feedback, skip, goHome) { $scope.sendFeedback = function(feedback, goHome) {
var config = configService.getSync(); var config = configService.getSync();
var dataSrc = { var dataSrc = {
"Email": lodash.values(config.emailFor)[0] || ' ', "Email": lodash.values(config.emailFor)[0] || ' ',
"Feedback": skip ? ' ' : feedback, "Feedback": goHome ? ' ' : feedback,
"Score": $stateParams.score || ' ', "Score": $stateParams.score || ' ',
"AppVersion": $window.version, "AppVersion": $window.version,
"Platform": ionic.Platform.platform(), "Platform": ionic.Platform.platform(),
"DeviceVersion": ionic.Platform.version() "DeviceVersion": ionic.Platform.version()
}; };
if(!(goHome || skip)) ongoingProcess.set('sendingFeedback', true); if (!goHome) ongoingProcess.set('sendingFeedback', true);
feedbackService.send(dataSrc, function(err) { feedbackService.send(dataSrc, function(err) {
if(goHome || skip) return; if (goHome) return;
ongoingProcess.set('sendingFeedback', false); ongoingProcess.set('sendingFeedback', false);
if (err) { if (err) {
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Feedback could not be submitted. Please try again later.')); popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Feedback could not be submitted. Please try again later.'));
@ -35,18 +35,10 @@ angular.module('copayApp.controllers').controller('sendController', function($sc
return; return;
} }
$state.go('tabs.rate.complete', { $state.go('tabs.rate.complete', {
score: $stateParams.score, score: $stateParams.score
skipped: skip
}); });
}); });
if(goHome){ if (goHome) $state.go('tabs.home');
$state.go('tabs.home');
} else if(skip) {
$state.go('tabs.rate.complete', {
score: $stateParams.score,
skipped: skip
});
}
}; };
$scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.$on("$ionicView.beforeEnter", function(event, data) {

6
www/views/feedback/send.html
View file

@ -2,7 +2,7 @@
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Send Feedback' | translate}}</ion-nav-title> <ion-nav-title>{{'Send Feedback' | translate}}</ion-nav-title>
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button ng-show="score" class="button no-border ng-hide" ng-click="sendFeedback(null, true, true)" translate> <button ng-show="score" class="button no-border ng-hide" ng-click="sendFeedback(null, true)" translate>
Cancel Cancel
</button> </button>
<button ng-show="!score || fromSettings" class="button back-button button-clear ng-hide" ng-click="goBack()"> <button ng-show="!score || fromSettings" class="button back-button button-clear ng-hide" ng-click="goBack()">
@ -10,7 +10,7 @@
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
<ion-nav-buttons side="secondary"> <ion-nav-buttons side="secondary">
<button ng-disabled="!feedback.value" class="button no-border" type="submit" ng-click="sendFeedback(feedback.value, false)" translate> <button ng-disabled="!feedback.value" class="button no-border" type="submit" ng-click="sendFeedback(feedback.value)" translate>
Send Send
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
@ -40,7 +40,7 @@
</div> </div>
<div ng-if="showForm" class="form-fade-in"> <div ng-if="showForm" class="form-fade-in">
<textarea class="user-feedback" ng-model="feedback.value" rows="5" placeholder="Your ideas, feedback, or comments" autofocus></textarea> <textarea class="user-feedback" ng-model="feedback.value" rows="5" placeholder="Your ideas, feedback, or comments" autofocus></textarea>
<button ng-disabled="!feedback.value" type="submit" class="button button-standard button-primary" ng-click="sendFeedback(feedback.value, false)" translate> <button ng-disabled="!feedback.value" type="submit" class="button button-standard button-primary" ng-click="sendFeedback(feedback.value)" translate>
Send Send
</button> </button>
</div> </div>