Skip to content

Bump showdown from 1.2.1 to 1.9.1 #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Bump showdown from 1.2.1 to 1.9.1 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81af317
log out from anywhere including User Data/Build Model redirected to R…
qzzhang Aug 4, 2020
2277878
Merge branch 'master' of https://github.com/ModelSEED/ModelSEED-UI
qzzhang Aug 4, 2020
f48ad4d
fixed the home page login behavior
qzzhang Aug 4, 2020
66777a8
Merge pull request #153 from qzzhang/master
samseaver Aug 4, 2020
30a490f
Bump showdown from 1.2.1 to 1.9.1
dependabot[bot] Sep 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/ctrls/ms-ctrls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ function($scope, $state, $stateParams, Auth, $window) {
// sets method and changes url param
$scope.switchMethod = function(method) {
$scope.method = Auth.loginMethod(method);
$scope.inValid = false;
//$state.go('main.home', {login: method});
}

Expand Down
12 changes: 8 additions & 4 deletions app/services/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,14 @@ function($state, $http, config, $window) {

this.logout = function() {
$window.localStorage.removeItem('auth');
$state.transitionTo('main.home', {}, { reload: true, inherit: true, notify: false })
.then(function() {
$window.location.reload();
});

var to_url = window.location.protocol + '//' + window.location.host;
if ($state.current.name === 'main.home') {
$window.location.reload();
} else {
to_url = to_url + '/genomes/Plants';
$window.location.replace(to_url);
}
}

this.isAuthenticated = function() {
Expand Down
1 change: 0 additions & 1 deletion app/services/dialogs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,6 @@ function($rootScope, $dialog, $window, $timeout, Auth, $stateParams) {
$s.method = Auth.loginMethod(method);
$stateParams.login = method;
$s.inValid = false;
$s.creds = {};
}

$s.ok = function(){
Expand Down
2 changes: 1 addition & 1 deletion app/views/dialogs/auth.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<h3>Please sign in</h3>
<span flex></span>
<md-button class="md-icon-button" ng-click="cancel()" ui-sref="main.home" tabindex="1">
<md-icon class="material-icons" aria-label="Close signin dialog, go to homepage">close</md-icon>
<md-icon class="material-icons" aria-label="Close signIn dialog, go to homepage">close</md-icon>
</md-button>
</div>
</md-toolbar>
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
"jquery": "3.4.0",
"ng-context-menu": "github:talis/ng-context-menu#v1.0.1",
"papaparse": "4.1.2",
"showdown": "1.2.1"
"showdown": "1.9.1"
}
}