Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-09 06:43:24 +00:00
Code Issues Projects Releases Wiki Activity

Improved error handling and error page

Browse Source
This commit is contained in:
Colin McLeod
2015-05-03 18:33:13 -07:00
parent 508679c185
commit 44f5409246
9 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/index.html
View File

@@ -28,7 +28,7 @@
<footer>
<div class="right">
<a href="https://github.com/cmmcleod/ed-shipyard" target="_blank" title="Shipyard Github Project">Version <%= version %> - <%= date %></a>
<a href="https://github.com/cmmcleod/ed-shipyard" target="_blank" title="Coriolis Github Project">Version <%= version %> - <%= date %></a>
</div>
<div class="l">
Coriolis Shipyard was created using assets and imagery from Elite: Dangerous, with the permission of Frontier Developments plc, for non-commercial purposes.<br>

6
app/js/config.js
View File

@@ -46,10 +46,10 @@ angular.module('app').config(['$provide','$stateProvider', '$urlRouterProvider',
*
*/
$provide.decorator('$exceptionHandler', ['$delegate', '$injector', function ($delegate, $injector) {
return function(exception, cause) {
return function(err, cause) {
// Go to error state, reload the controller, keep the current URL
$injector.get('$state').go('error', { details: exception }, {location:false, reload:true});
$delegate(exception, cause);
$injector.get('$state').go('error', {type:null, message: err.message, details: err.stack }, {location:false, reload:true});
$delegate(err, cause);
};
}]);

13
app/js/controllers/controller-error.js
View File

@@ -7,26 +7,27 @@ angular.module('app')
switch ($scope.type) {
case 404:
$rootScope.bodyClass = 'deep-space';
$scope.msgPre = 'Page';
$scope.msgHighlight = $scope.path;
$scope.msgPost = 'Not Found';
$rootScope.bodyClass = 'deep-space';
break;
case 'no-ship':
$rootScope.bodyClass = 'docking-bay';
$scope.msgPre = 'Ship';
$scope.msgHighlight = $p.message;
$scope.msgPost = 'does not exist';
$rootScope.bodyClass = 'docking-bay';
break;
case 'build-fail':
$rootScope.bodyClass = 'ship-explode'; // TODO: create background imag for this
$scope.msgPre = 'Build Failure!';
$scope.image = 'ship-explode';
$rootScope.bodyClass = 'docking-bay';
$scope.details = $p.details;
break;
default:
$rootScope.bodyClass = 'thargoid'; // TODO: create background imag for this
$scope.msgPre = "Uh, this is bad..";
$scope.image = 'thargoid';
$rootScope.bodyClass = null;
$scope.errorMessage = $p.message;
$scope.details = $p.details;
}
}]);

2
app/js/controllers/controller-shipyard.js
View File

@@ -1,4 +1,4 @@
angular.module('app').controller('ShipyardController', ['$rootScope', function ($rootScope) {
$rootScope.title = 'Coriolis - Shipyard';
$rootScope.title = 'Coriolis';
$rootScope.bodyClass = 'docking-bay';
}]);

7
app/js/directives/directive-component-select.js
View File

@@ -2,18 +2,19 @@ angular.module('app').directive('componentSelect', [ function() {
return {
restrict: 'A',
scope:{
opts: '=', // Component Options object
opts: '=', // Component Options object
mass: '=' // Current ship mass
},
link: function(scope, element) {
var list = [], o, id;
var opts = scope.opts;
//TODO: take current ship mass into account if provided
var mass = scope.mass || 0;
// Generting the HTML in this manner is MUCH faster than using an angular template.
for (id in opts) {
o = opts[id];
list.push('<li class="');
list.push(o.name? 'lc' : 'c');
if (false) { // Omit id if mass is exceeded making it 'disabled'
if (o.maxmass && mass > o.maxmass) { // Omit id if mass is exceeded making it 'disabled'
list.push(' disabled"');
} else {
list.push('" id="');

1
app/js/shipyard/factory-ship.js
View File

@@ -92,7 +92,6 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
this.armourTotal = this.armourAdded + this.armour;
// TODO: shield recharge rate
// TODO: armor bonus / damage reduction for bulkheads
// TODO: thermal load and weapon recharge rate
};
/**

8
app/less/select.less
View File

@@ -27,6 +27,10 @@
&:hover {
color: @warning;
}
&.disabled {
cursor: not-allowed;
color: @disabled;
}
}
@optionSpacing: 1.8em;
@@ -70,6 +74,10 @@
&:nth-child(5n +1) {
clear: left;
}
&.disabled {
border:1px solid @disabled;
}
}
ul {

19
app/views/page-error.html
View File

@@ -5,12 +5,15 @@
<span ng-if="msgPost">{{msgPost}}</span>
</h1>
<!-- TODO: add awesome relevant SVG based on code /-->
<p ng-if="path" >Path: {{path}}</p>
<p ng-if="type">Error: {{type}}</p>
<p ng-if="details">Details: {{details | json}}</p>
<p>Browser: {{browser}}</p>
<div style="text-align:left; font-size:0.8em; width: 43em; margin:0 auto;" >
<a href="https://github.com/cmmcleod/ed-shipyard" target="_blank" title="Coriolis Github Project">Create an issue on Github</a>
if you this if this keeps happening. <a href="#" ng-click="showDetails = !showDetails">Add these details</a>
<div style="margin-top: 2em;" ng-show="showDetails">
<div>Browser:<br>{{browser}}</div>
<div ng-if="path" >Path:<br>{{path}}</div>
<div ng-if="type">Error:<br>{{type}}</div>
<div ng-if="errorMessage">Message:<br>{{errorMessage}}</div>
<div ng-if="details">Details:<br><pre>{{details}}<pre></div>
</div>
</div>
</div>
<!-- TODO: Add github issue link /-->

2
app/views/page-outfit.html
View File

@@ -52,7 +52,7 @@
<div class="l">Max: {{th.c.maxmass}} <u>T</u></div>
<div class="r">{{th.c.mass}} <u>T</u></div>
</div>
<div component-select class="select" opts="availCS.common[1]" ng-if="selectedSlot==th" ng-click="select('c',th,$event)"></div>
<div component-select class="select" mass="ship.unladenMass" opts="availCS.common[1]" ng-if="selectedSlot==th" ng-click="select('c',th,$event)"></div>
</div>
<div class="slot" ng-click="selectSlot($event, fsd)" ng-class="{selected: selectedSlot==fsd}">
<div class="details">