Repository: syncope
Updated Branches:
  refs/heads/2_0_X 44a858dc9 -> 5e6242bb5


[SYNCOPE-997] update angular-ui-router


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5e6242bb
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5e6242bb
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5e6242bb

Branch: refs/heads/2_0_X
Commit: 5e6242bb55f6bd725dc16a8a670ecb01f8b96d53
Parents: 44a858d
Author: Matteo Di Carlo <matteo.dica...@tirasa.net>
Authored: Fri Jan 13 17:30:20 2017 +0100
Committer: Matteo Di Carlo <matteo.dica...@tirasa.net>
Committed: Fri Jan 13 17:30:20 2017 +0100

----------------------------------------------------------------------
 client/enduser/pom.xml                                        | 2 +-
 .../src/main/resources/META-INF/resources/app/index.html      | 2 +-
 .../src/main/resources/META-INF/resources/app/js/app.js       | 7 ++-----
 pom.xml                                                       | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/5e6242bb/client/enduser/pom.xml
----------------------------------------------------------------------
diff --git a/client/enduser/pom.xml b/client/enduser/pom.xml
index 900521b..7cbe58b 100644
--- a/client/enduser/pom.xml
+++ b/client/enduser/pom.xml
@@ -70,7 +70,7 @@ under the License.
       <artifactId>angular-resource</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.webjars</groupId>
+      <groupId>org.webjars.bower</groupId>
       <artifactId>angular-ui-router</artifactId>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/syncope/blob/5e6242bb/client/enduser/src/main/resources/META-INF/resources/app/index.html
----------------------------------------------------------------------
diff --git 
a/client/enduser/src/main/resources/META-INF/resources/app/index.html 
b/client/enduser/src/main/resources/META-INF/resources/app/index.html
index 22152fc..ef58553 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/index.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/index.html
@@ -63,7 +63,7 @@ under the License.
 
   <script src="../webjars/jquery/${jquery.version}/jquery.js"></script>
   <script src="../webjars/angular/${angular.version}/angular.js"></script>
-  <script 
src="../webjars/angular-ui-router/${angular-ui-router.version}/angular-ui-router.js"></script>
+  <script 
src="../webjars/angular-ui-router/${angular-ui-router.version}/release/angular-ui-router.js"></script>
   <script 
src="../webjars/angular-animate/${angular.version}/angular-animate.js"></script>
   <script 
src="../webjars/angular-resource/${angular.version}/angular-resource.js"></script>
   <script 
src="../webjars/angular-cookies/${angular.version}/angular-cookies.js"></script>

http://git-wip-us.apache.org/repos/asf/syncope/blob/5e6242bb/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js 
b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
index 37bcafd..5d062cb 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
@@ -45,12 +45,9 @@ var app = angular.module('SyncopeEnduserApp', [
   'pascalprecht.translate'
 ]);
 
-app.config(['$qProvider', '$stateProvider', '$urlRouterProvider', 
'$httpProvider', '$translateProvider', '$translatePartialLoaderProvider',
-  function ($qProvider, $stateProvider, $urlRouterProvider, $httpProvider, 
$translateProvider, $translatePartialLoaderProvider) {
+app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 
'$translateProvider', '$translatePartialLoaderProvider',
+  function ($stateProvider, $urlRouterProvider, $httpProvider, 
$translateProvider, $translatePartialLoaderProvider) {
     
-    //workaround for angular-ui-router issue: [SYNCOPE-997]
-    $qProvider.errorOnUnhandledRejections(false);
-
     $translatePartialLoaderProvider.addPart('static');
     $translatePartialLoaderProvider.addPart('dynamic');
     $translateProvider.useLoader('$translatePartialLoader', {

http://git-wip-us.apache.org/repos/asf/syncope/blob/5e6242bb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1c4e98a..a0823ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -426,7 +426,7 @@ under the License.
     <wicket-chartjs.version>7.0.1</wicket-chartjs.version>
 
     <angular.version>1.6.1</angular.version>
-    <angular-ui-router.version>0.2.18</angular-ui-router.version>
+    <angular-ui-router.version>0.3.2</angular-ui-router.version>
     <angular-ui-bootstrap.version>1.3.3</angular-ui-bootstrap.version>
     <angular-ui-select.version>0.19.6</angular-ui-select.version>
     
<angular-treasure-overlay-spinner.version>1.1.0</angular-treasure-overlay-spinner.version>
@@ -1184,7 +1184,7 @@ under the License.
         <version>${angular.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.webjars</groupId>
+        <groupId>org.webjars.bower</groupId>
         <artifactId>angular-ui-router</artifactId>
         <version>${angular-ui-router.version}</version>
         <exclusions>

Reply via email to