Merge branch 'feature/63-update-icmm-js-version' into dev

clarity-h2020 · Nov 7, 2014 · be1a229 · be1a229
2 parents 9ba3410 + fe272b3
commit be1a229
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/app/index.html b/app/index.html
@@ -66,7 +66,7 @@
                         </tab>
                         <tab select="switchToFilesTab();icmmTabCollapsed=false" active="filesTabActive">
                             <tab-heading>
-                                 <i class="glyphicon glyphicon-chevron-up" 
+                                <i class="glyphicon glyphicon-chevron-up" 
                                    ng-show="filesTabActive && !icmmTabCollapsed"
                                    ng-click="icmmTabCollapsed = true"
                                    style="color:#2a6496; cursor: pointer"></i>
@@ -546,11 +546,12 @@ <h3 class="panel-title ng-binding">
         <script>
                                                                                 angular.module('eu.crismaproject.worldstateAnalysis.demoApp').config(
                                                                                     [
-                                                                                        'de.cismet.crisma.ICMM.config.IcmmSettingsProvider',
-                                                                                        function (IcmmSettingsProvider) {
+                                                                                        '$provide',
+                                                                                        function ($provide) {
                                                                                             'use strict';
-                                                                                            IcmmSettingsProvider.setInitialIcmmApi('http://crisma.cismet.de/icmm_api');
-                                                                                            IcmmSettingsProvider.setInitialDomain('CRISMA');
+                                                                                            $provide.constant('CRISMA_DOMAIN', 'CRISMA');
+//                                                                                    $provide.constant('CRISMA_ICMM_API', 'http://localhost:8890');
+                                                                                            $provide.constant('CRISMA_ICMM_API', 'http://crisma.cismet.de/icmm_api');
                                                                                         }
                                                                                     ]
                                                                                     );</script>

diff --git a/bower.json b/bower.json
@@ -25,7 +25,7 @@
     "jquery-ui": "1.10.4",
     "ng-table": "0.3.3",
     "bootstrap": "3.3.0",
-    "icmm_js": "1.1.1",
+    "icmm_js": "1.1.2",
     "dynatree": "1.2.5",
     "crisma-worldstate-tree-widget-angular": "1.0.8",
     "d3": "3.3.6",
@@ -44,7 +44,7 @@
   "resolutions": {
     "bootstrap": "3.3.0",
     "d3": "3.3.6",
-    "icmm_js": "1.1.1",
+    "icmm_js": "1.1.2",
     "angular": "1.2.25"
   }
 }