Skip to content

Commit

Permalink
#2 update bower dependencies and add seamless.js
Browse files Browse the repository at this point in the history
  • Loading branch information
p-a-s-c-a-l committed Oct 25, 2018
1 parent 142bccd commit a888778
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 15 deletions.
4 changes: 4 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"directory": "app/bower_components",
"registry": "https://registry.bower.io"
}
33 changes: 22 additions & 11 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
<!-- build:css() -->
<link rel="stylesheet" href="styles/indicatorCriteriaTableDirective.css">
<!-- endbuild -->


<!-- seamless.js -->
<script src="bower_components/seamless/build/seamless.child.js" type="text/javascript"></script>
</head>
<body ng-app="eu.crismaproject.worldstateAnalysis.demoApp">
<!--[if lt IE 7]>
Expand Down Expand Up @@ -544,17 +546,26 @@ <h3 class="panel-title ng-binding">

<!-- demo only -->
<script>
angular.module('eu.crismaproject.worldstateAnalysis.demoApp').config(
[
'$provide',
function ($provide) {
'use strict';
$provide.constant('CRISMA_DOMAIN', 'CRISMA');
angular.module('eu.crismaproject.worldstateAnalysis.demoApp').config(
[
'$provide',
function ($provide) {
'use strict';
$provide.constant('CRISMA_DOMAIN', 'CRISMA');
// $provide.constant('CRISMA_ICMM_API', 'http://localhost:8890');
$provide.constant('CRISMA_ICMM_API', 'http://crisma.cismet.de/icmm_api');
$provide.constant('CRISMA_ICMM_API', 'http://crisma.cismet.de/icmm_api');
// $provide.constant('CRISMA_ICMM_API', 'sadfg');
}
]
);</script>
}
]
);
</script>

<!-- seamless.js -->
<script type="text/javascript">

// Connect to the parent page.
// https://github.com/travist/seamless.js?files=1#connect-child-page-to-parent-page
window.seamless.connect();
</script>
</body>
</html>
8 changes: 4 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"karma*",
"package.json"
],
"dependencies": {
"angular-strap":"2.1.6",
"dependencies": {"seamless.js":"1.3.0",
"angular-strap": "2.1.3",
"angular": "1.2.29",
"angular-resource": "1.2.29",
"angular-commons": "0.2.0",
Expand All @@ -32,11 +32,11 @@
"d3": "3.3.13",
"nvd3": "1.1.15-beta",
"angularjs-nvd3-directives": "0.0.7",
"angular-strap": "2.1.3",
"jquery-knob": "1.2.13",
"ngDialog": "0.2.14",
"radar-chart-d3": "1.2.1",
"angular-bootstrap": "0.11.2"
"angular-bootstrap": "0.11.2",
"seamless": "seamless.js#1.3.0"
},
"devDependencies": {
"angular-mocks": "1.2.29",
Expand Down

0 comments on commit a888778

Please sign in to comment.