Skip to content

Commit bc961f0

Browse files
Upgrade to ui-router 1.x
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
1 parent f95e7eb commit bc961f0

File tree

8 files changed

+273
-16
lines changed

8 files changed

+273
-16
lines changed

src/main/webapp/WEB-INF/pages/template/base-template.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@
7171
<script type="text/javascript" th:src="@{/static/js/lib/angular/ng-lodash.min.js}"></script>
7272
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-resource.min.js}" ></script>
7373
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-route.min.js}"></script>
74-
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-ui-router.min.js}"></script>
75-
<script type="text/javascript" th:src="@{/static/js/lib/angular/ct-ui-router-extras.min.js}"></script>
74+
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-router-core.min.js}"></script>
75+
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-router-sticky-states.js}"></script>
76+
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-router-angularjs.min.js}"></script>
7677
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-bootstrap-tpls-0.14.3.min.js}"></script>
7778
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-select2.js}"></script>
7879
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-local-storage.min.js}"></script>

src/main/webapp/WEB-INF/pages/template/ng-base-template.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@
8080
<script type="text/javascript" th:src="@{/static/js/lib/angular/ng-lodash.min.js}"></script>
8181
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-resource.min.js}" ></script>
8282
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-route.min.js}"></script>
83-
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-ui-router.min.js}"></script>
84-
<script type="text/javascript" th:src="@{/static/js/lib/angular/ct-ui-router-extras.min.js}"></script>
83+
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-router-core.min.js}"></script>
84+
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-router-sticky-states.js}"></script>
85+
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-router-angularjs.min.js}"></script>
8586
<script type="text/javascript" th:src="@{/static/js/lib/angular/ui-bootstrap-tpls-0.14.3.min.js}"></script>
8687
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-select2.js}"></script>
8788
<script type="text/javascript" th:src="@{/static/js/lib/angular/angular-sanitize.min.js}"></script>

src/main/webapp/WEB-INF/static/js/lib/angular/angular-ui-router.min.js

-7
This file was deleted.

src/main/webapp/WEB-INF/static/js/lib/angular/ct-ui-router-extras.min.js

-2
This file was deleted.

src/main/webapp/WEB-INF/static/js/lib/angular/ui-router-angularjs.min.js

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/webapp/WEB-INF/static/js/lib/angular/ui-router-core.min.js

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/webapp/WEB-INF/static/js/lib/angular/ui-router-sticky-states.js

+246
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/webapp/WEB-INF/static/js/trialmanager/manageTrial.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ stockListImportNotSaved, ImportDesign, isOpenStudy, displayAdvanceList, Inventor
88
'use strict';
99

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

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

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

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

2627
$urlRouterProvider.otherwise('/trialSettings');
2728
$stateProvider

0 commit comments

Comments
 (0)