x/merlin
Code Issues Proposed changes

Change location of symlink to bower_components

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

Change-Id: Id4a8fa8dc3cd0915b33ead24421c14155897939e
This commit is contained in:
Timur Sufiev 2015-07-22 12:51:41 +03:00
parent d82d48453f
commit e17565a708
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintignore
View File

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

4
extensions/mistral/templates/mistral/create.html
View File

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

4
karma-unit.conf.js
View File

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

1
merlin/static/merlin/js/libs
View File

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

1
merlin/static/merlin/libs Symbolic link
View File

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