kgess-mirror/standardnotes-app
1
0
Fork 0
mirror of https://github.com/standardnotes/app.git synced 2026-01-16 23:01:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

angular supress unhandled rejection

Browse source
This commit is contained in:
Mo Bitar 2016-12-18 00:09:57 -06:00
parent d527c8d34b
commit 3794d0496c
8 changed files with 95 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -24,6 +24,7 @@
/node_modules
/vendor/assets/javascripts/app.js
/vendor/assets/javascripts/compiled.js
/vendor/assets/javascripts/transpiled.js
/vendor/assets/javascripts/compiled.min.js
/vendor/assets/javascripts/lib.js
/vendor/assets/javascripts/templates.js

9
app/assets/javascripts/app/app.frontend.js
View file

@ -3,18 +3,16 @@
var Neeto = Neeto || {};
if(window.crypto.subtle) {
console.log("using WebCrypto");
// console.log("using WebCrypto");
Neeto.crypto = new SNCryptoWeb();
} else {
console.log("using CryptoJS");
// console.log("using CryptoJS");
Neeto.crypto = new SNCryptoJS();
}
angular.module('app.frontend', [
'ui.router',
'ng-token-auth',
'restangular',
'ipCookie',
'oc.lazyLoad',
'angularLazyImg',
'ngDialog'
@ -40,3 +38,6 @@ angular.module('app.frontend', [
};
});
})
.config(['$qProvider', function ($qProvider) {
$qProvider.errorOnUnhandledRejections(false);
}]);

20
app/assets/javascripts/app/frontend/controllers/header.js
View file

@ -17,7 +17,7 @@ angular.module('app.frontend')
}
}
})
.controller('HeaderCtrl', function ($auth, $state, apiController, modelManager, serverSideValidation, $timeout) {
.controller('HeaderCtrl', function ($state, apiController, modelManager, serverSideValidation, $timeout) {
this.changePasswordPressed = function() {
this.showNewPasswordForm = !this.showNewPasswordForm;
@ -97,15 +97,15 @@ angular.module('app.frontend')
}
this.forgotPasswordSubmit = function() {
$auth.requestPasswordReset(this.resetData)
.then(function(resp) {
this.resetData.response = "Success";
// handle success response
}.bind(this))
.catch(function(resp) {
// handle error response
this.resetData.response = "Error";
}.bind(this));
// $auth.requestPasswordReset(this.resetData)
// .then(function(resp) {
// this.resetData.response = "Success";
// // handle success response
// }.bind(this))
// .catch(function(resp) {
// // handle error response
// this.resetData.response = "Error";
// }.bind(this));
}
this.encryptionStatusForNotes = function() {

60
app/assets/javascripts/app/frontend/routes.js
View file

@ -19,36 +19,36 @@ angular.module('app.frontend')
})
// Auth routes
.state('auth', {
abstract: true,
url: '/auth',
parent: 'base',
views: {
'content@' : {
templateUrl: 'frontend/auth/wrapper.html',
}
}
})
.state('auth.login', {
url: '/login',
templateUrl: 'frontend/auth/login.html',
})
.state('auth.forgot', {
url: '/forgot',
templateUrl: 'frontend/auth/forgot.html',
})
.state('auth.reset', {
url: '/reset?reset_password_token&email',
templateUrl: 'frontend/auth/reset.html',
controller: function($rootScope, $stateParams) {
$rootScope.resetData = {reset_password_token: $stateParams.reset_password_token, email: $stateParams.email};
// Clear reset_password_token on change state
$rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams, options) {
$rootScope.reset_password_token = null;
});
},
})
// .state('auth', {
// abstract: true,
// url: '/auth',
// parent: 'base',
// views: {
// 'content@' : {
// templateUrl: 'frontend/auth/wrapper.html',
// }
// }
// })
// .state('auth.login', {
// url: '/login',
// templateUrl: 'frontend/auth/login.html',
// })
// .state('auth.forgot', {
// url: '/forgot',
// templateUrl: 'frontend/auth/forgot.html',
// })
// .state('auth.reset', {
// url: '/reset?reset_password_token&email',
// templateUrl: 'frontend/auth/reset.html',
// controller: function($rootScope, $stateParams) {
// $rootScope.resetData = {reset_password_token: $stateParams.reset_password_token, email: $stateParams.email};
//
// // Clear reset_password_token on change state
// $rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams, options) {
// $rootScope.reset_password_token = null;
// });
// },
// })
// 404 Error

2
app/views/application/frontend.html.erb
View file

@ -29,7 +29,7 @@
<meta name="og:description" content="A private and secure personal notes/blogging system."/>
<% if Rails.env.development? %>
<%= javascript_include_tag "compiled.js", debug: false %>
<%= javascript_include_tag "compiled.js", debug: true %>
<% else %>
<%= javascript_include_tag "compiled.min.js", debug: false %>

2
bower.json
View file

@ -10,10 +10,8 @@
"angular": "^1.6.0",
"angular-ui-router": "^0.2.18",
"restangular": "^1.5.2",
"ng-token-auth": "^0.0.29",
"oclazyload": "^1.0.9",
"font-awesome": "^4.6.2",
"angular-cookie": "4.1.0",
"marked": "0.3.4",
"angular-lazy-img": "1.1.0",
"ng-dialog" : "0.6.4"

85
vendor/assets/javascripts/transpiled.js vendored
View file

@ -329,14 +329,14 @@ exports.SNCryptoWeb = SNCryptoWeb;
var Neeto = Neeto || {};
if (window.crypto.subtle) {
console.log("using WebCrypto");
// console.log("using WebCrypto");
Neeto.crypto = new SNCryptoWeb();
} else {
console.log("using CryptoJS");
// console.log("using CryptoJS");
Neeto.crypto = new SNCryptoJS();
}
angular.module('app.frontend', ['ui.router', 'ng-token-auth', 'restangular', 'ipCookie', 'oc.lazyLoad', 'angularLazyImg', 'ngDialog']).config(function (RestangularProvider, apiControllerProvider) {
angular.module('app.frontend', ['ui.router', 'restangular', 'oc.lazyLoad', 'angularLazyImg', 'ngDialog']).config(function (RestangularProvider, apiControllerProvider) {
RestangularProvider.setDefaultHeaders({ "Content-Type": "application/json" });
var url = apiControllerProvider.defaultServerURL();
@ -355,7 +355,10 @@ angular.module('app.frontend', ['ui.router', 'ng-token-auth', 'restangular', 'ip
httpConfig: httpConfig
};
});
});angular.module('app.frontend').config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
}).config(['$qProvider', function ($qProvider) {
$qProvider.errorOnUnhandledRejections(false);
}]);
;angular.module('app.frontend').config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
$stateProvider.state('base', {
abstract: true
@ -374,33 +377,37 @@ angular.module('app.frontend', ['ui.router', 'ng-token-auth', 'restangular', 'ip
})
// Auth routes
.state('auth', {
abstract: true,
url: '/auth',
parent: 'base',
views: {
'content@': {
templateUrl: 'frontend/auth/wrapper.html'
}
}
}).state('auth.login', {
url: '/login',
templateUrl: 'frontend/auth/login.html'
}).state('auth.forgot', {
url: '/forgot',
templateUrl: 'frontend/auth/forgot.html'
}).state('auth.reset', {
url: '/reset?reset_password_token&email',
templateUrl: 'frontend/auth/reset.html',
controller: function controller($rootScope, $stateParams) {
$rootScope.resetData = { reset_password_token: $stateParams.reset_password_token, email: $stateParams.email };
// .state('auth', {
// abstract: true,
// url: '/auth',
// parent: 'base',
// views: {
// 'content@' : {
// templateUrl: 'frontend/auth/wrapper.html',
// }
// }
// })
// .state('auth.login', {
// url: '/login',
// templateUrl: 'frontend/auth/login.html',
// })
// .state('auth.forgot', {
// url: '/forgot',
// templateUrl: 'frontend/auth/forgot.html',
// })
// .state('auth.reset', {
// url: '/reset?reset_password_token&email',
// templateUrl: 'frontend/auth/reset.html',
// controller: function($rootScope, $stateParams) {
// $rootScope.resetData = {reset_password_token: $stateParams.reset_password_token, email: $stateParams.email};
//
// // Clear reset_password_token on change state
// $rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams, options) {
// $rootScope.reset_password_token = null;
// });
// },
// })
// Clear reset_password_token on change state
$rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams, options) {
$rootScope.reset_password_token = null;
});
}
})
// 404 Error
.state('404', {
@ -737,7 +744,7 @@ angular.module('app.frontend').controller('BaseCtrl', BaseCtrl);
link: function link(scope, elem, attrs, ctrl) {}
};
}).controller('HeaderCtrl', function ($auth, $state, apiController, modelManager, serverSideValidation, $timeout) {
}).controller('HeaderCtrl', function ($state, apiController, modelManager, serverSideValidation, $timeout) {
this.changePasswordPressed = function () {
this.showNewPasswordForm = !this.showNewPasswordForm;
@ -814,13 +821,15 @@ angular.module('app.frontend').controller('BaseCtrl', BaseCtrl);
};
this.forgotPasswordSubmit = function () {
$auth.requestPasswordReset(this.resetData).then(function (resp) {
this.resetData.response = "Success";
// handle success response
}.bind(this)).catch(function (resp) {
// handle error response
this.resetData.response = "Error";
}.bind(this));
// $auth.requestPasswordReset(this.resetData)
// .then(function(resp) {
// this.resetData.response = "Success";
// // handle success response
// }.bind(this))
// .catch(function(resp) {
// // handle error response
// this.resetData.response = "Error";
// }.bind(this));
};
this.encryptionStatusForNotes = function () {

2
vendor/assets/javascripts/transpiled.js.map vendored
View file

File diff suppressed because one or more lines are too long