Browse Source

Change location of symlink to bower_components

Do so in order to use both js and css assets fetched with bower.

Change-Id: Id4a8fa8dc3cd0915b33ead24421c14155897939e
Timur Sufiev 3 years ago
parent
commit
e17565a708

+ 1
- 1
.eslintignore View File

@@ -1,2 +1,2 @@
1
-merlin/static/merlin/js/libs
1
+merlin/static/merlin/libs
2 2
 merlin/static/merlin/js/custom-libs

+ 2
- 2
extensions/mistral/templates/mistral/create.html View File

@@ -12,8 +12,8 @@
12 12
 {% block js %}
13 13
 {% include "horizon/_scripts.html" %}
14 14
 <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/custom-libs/barricade.js"></script>
15
-<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/libs/js-yaml/dist/js-yaml.min.js"></script>
16
-<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/libs/underscore/underscore-min.js"></script>
15
+<script type="text/javascript" src="{{ STATIC_URL }}merlin/libs/js-yaml/dist/js-yaml.min.js"></script>
16
+<script type="text/javascript" src="{{ STATIC_URL }}merlin/libs/underscore/underscore-min.js"></script>
17 17
 <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.init.js"></script>
18 18
 <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.templates.js"></script>
19 19
 <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.filters.js"></script>

+ 2
- 2
karma-unit.conf.js View File

@@ -40,8 +40,8 @@ module.exports = function (config) {
40 40
       'bower_components/jquery/dist/jquery.min.js',
41 41
       'bower_components/angular/angular.js',
42 42
       'bower_components/angular-mocks/angular-mocks.js',
43
-      'merlin/static/merlin/js/libs/underscore/underscore-min.js',
44
-      'merlin/static/merlin/js/libs/js-yaml/dist/js-yaml.min.js',
43
+      'merlin/static/merlin/libs/underscore/underscore-min.js',
44
+      'merlin/static/merlin/libs/js-yaml/dist/js-yaml.min.js',
45 45
       'merlin/static/merlin/js/custom-libs/barricade.js',
46 46
       'merlin/static/merlin/js/custom-libs/ui-bootstrap-tpls-0.12.1.js',
47 47
       // explicitly require first module definition file to avoid errors

+ 0
- 1
merlin/static/merlin/js/libs View File

@@ -1 +0,0 @@
1
-../../../../bower_components/

+ 1
- 0
merlin/static/merlin/libs View File

@@ -0,0 +1 @@
1
+../../../bower_components/

Loading…
Cancel
Save