Skip to content

Commit

Permalink
Upgrade to ui-router 1.x
Browse files Browse the repository at this point in the history
Following these steps:
- npm install uirouter/core uirouter/sticky-states uirouter/angularjs
- copy minified js

To be able to receive params by reference, needed for subobservation
nested state
(see angular-ui/ui-router/issues/3189)

Issue: BMS-5187 / BMS-5188 / BMS-5189
Reviewer: None
  • Loading branch information
nahuel-soldevilla committed Sep 27, 2018
1 parent f95e7eb commit bc961f0
Show file tree
Hide file tree
Showing 8 changed files with 273 additions and 16 deletions.
5 changes: 3 additions & 2 deletions src/main/webapp/WEB-INF/pages/template/base-template.html
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@
<script type="text/javascript" th:src="@{/static/js/lib/angular/ng-lodash.min.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-resource.min.js}" ></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-route.min.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-ui-router.min.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/ct-ui-router-extras.min.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-router-core.min.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-router-sticky-states.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-router-angularjs.min.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-bootstrap-tpls-0.14.3.min.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-select2.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-local-storage.min.js}"></script>
Expand Down
5 changes: 3 additions & 2 deletions src/main/webapp/WEB-INF/pages/template/ng-base-template.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,9 @@
<script type="text/javascript" th:src="@{/static/js/lib/angular/ng-lodash.min.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-resource.min.js}" ></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-route.min.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-ui-router.min.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/ct-ui-router-extras.min.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-router-core.min.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-router-sticky-states.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-router-angularjs.min.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-bootstrap-tpls-0.14.3.min.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-select2.js}"></script>
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-sanitize.min.js}"></script>
Expand Down

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions src/main/webapp/WEB-INF/static/js/trialmanager/manageTrial.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stockListImportNotSaved, ImportDesign, isOpenStudy, displayAdvanceList, Inventor
'use strict';

var manageTrialApp = angular.module('manageTrialApp', ['designImportApp', 'leafnode-utils', 'fieldbook-utils',
'ct.ui.router.extras', 'ui.bootstrap', 'ngLodash', 'ngResource', 'ngStorage', 'datatables', 'datatables.buttons',
'ui.router', 'ui.bootstrap', 'ngLodash', 'ngResource', 'ngStorage', 'datatables', 'datatables.buttons',
'showSettingFormElementNew', 'ngSanitize', 'ui.select']);

/*** Added to prevent Unsecured HTML error
Expand All @@ -19,9 +19,10 @@ stockListImportNotSaved, ImportDesign, isOpenStudy, displayAdvanceList, Inventor

// routing configuration
// TODO: if possible, retrieve the template urls from the list of constants
manageTrialApp.config(function($stateProvider, $urlRouterProvider, $stickyStateProvider) {
manageTrialApp.config(function($uiRouterProvider, $stateProvider, $urlRouterProvider) {

$stickyStateProvider.enableDebug(false);
var StickyStates = window['@uirouter/sticky-states'];
$uiRouterProvider.plugin(StickyStates.StickyStatesPlugin);

$urlRouterProvider.otherwise('/trialSettings');
$stateProvider
Expand Down

0 comments on commit bc961f0

Please sign in to comment.