Skip to content

Commit

Permalink
moved js text directory to libs directory
Browse files Browse the repository at this point in the history
  • Loading branch information
@larryweya
larryweya committed Jan 12, 2014
1 parent f6c1799 commit e8e8244
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .bowerrc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"directory": "main/static/bower_components"
"directory": "onadata/apps/main/static/bower_components"
}
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ run_gunicorn.sh
celerybeat-schedule

# bower
main/static/bower_components
/onadata/apps/main/static/bower_components
35 changes: 17 additions & 18 deletions ...ta/apps/odk_viewer/js_tests/karma.conf.js → onadata/libs/javascript/tests/karma.conf.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = function(config) {
config.set({

// base path, that will be used to resolve files and exclude
basePath: '../../',
basePath: '../../../../',


// frameworks to use
Expand All @@ -14,28 +14,27 @@ module.exports = function(config) {

// list of files / patterns to load in the browser
files: [
'main/static/bower_components/jquery/jquery.js',
'main/static/bower_components/underscore/underscore.js',
'main/static/bower_components/backbone/backbone.js',
'main/static/bower_components/backgrid/lib/backgrid.js',
'main/static/bower_components/backgrid/assets/js/lunr.js',
'main/static/bower_components/backgrid/assets/js/backbone-pageable.js',
'main/static/bower_components/backgrid/lib/extensions/filter/backgrid-filter.js',
'main/static/bower_components/backgrid/lib/extensions/paginator/backgrid-paginator.js',
'main/static/bower_components/leaflet-dist/leaflet-src.js',
'onadata/apps/main/static/bower_components/jquery/jquery.js',
'onadata/apps/main/static/bower_components/underscore/underscore.js',
'onadata/apps/main/static/bower_components/backbone/backbone.js',
'onadata/apps/main/static/bower_components/backgrid/lib/backgrid.js',
'onadata/apps/main/static/bower_components/backgrid/assets/js/lunr.js',
'onadata/apps/main/static/bower_components/backgrid/assets/js/backbone-pageable.js',
'onadata/apps/main/static/bower_components/backgrid/lib/extensions/filter/backgrid-filter.js',
'onadata/apps/main/static/bower_components/backgrid/lib/extensions/paginator/backgrid-paginator.js',
'onadata/apps/main/static/bower_components/leaflet-dist/leaflet-src.js',
'https://maps.google.com/maps/api/js?v=3.2&sensor=false',
'main/static/js/dv.js',
'main/static/js/Google.js',
'onadata/apps/main/static/js/dv.js',
'onadata/apps/main/static/js/Google.js',
'node_modules/sinon/lib/sinon.js',
'node_modules/sinon/lib/sinon/util/event.js',
'node_modules/sinon/lib/sinon/util/fake_xml_http_request.js',
'node_modules/sinon/lib/sinon/util/fake_server.js',
'odk_viewer/static/js/map.js',
'odk_viewer/static/js/xform.js',
'odk_viewer/static/js/data_view.js',
'odk_viewer/static/js/ajax_mock.js',
'odk_viewer/js_tests/spec/*.js',
'odk_viewer/js_tests/mock/*.js'
'onadata/apps/odk_viewer/static/js/map.js',
'onadata/apps/odk_viewer/static/js/xform.js',
'onadata/apps/odk_viewer/static/js/data_view.js',
'onadata/libs/javascript/tests/spec/*.spec.js',
'onadata/libs/javascript/tests/mock/*.js'
],


Expand Down
34 changes: 17 additions & 17 deletions ...pps/odk_viewer/js_tests/karma_dev.conf.js → ...a/libs/javascript/tests/karma_dev.conf.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = function(config) {
config.set({

// base path, that will be used to resolve files and exclude
basePath: '../../',
basePath: '../../../../',


// frameworks to use
Expand All @@ -14,27 +14,27 @@ module.exports = function(config) {

// list of files / patterns to load in the browser
files: [
'main/static/bower_components/jquery/jquery.js',
'main/static/bower_components/underscore/underscore.js',
'main/static/bower_components/backbone/backbone.js',
'main/static/bower_components/backgrid/lib/backgrid.js',
'main/static/bower_components/backgrid/assets/js/lunr.js',
'main/static/bower_components/backgrid/assets/js/backbone-pageable.js',
'main/static/bower_components/backgrid/lib/extensions/filter/backgrid-filter.js',
'main/static/bower_components/backgrid/lib/extensions/paginator/backgrid-paginator.js',
'main/static/bower_components/leaflet-dist/leaflet-src.js',
'onadata/apps/main/static/bower_components/jquery/jquery.js',
'onadata/apps/main/static/bower_components/underscore/underscore.js',
'onadata/apps/main/static/bower_components/backbone/backbone.js',
'onadata/apps/main/static/bower_components/backgrid/lib/backgrid.js',
'onadata/apps/main/static/bower_components/backgrid/assets/js/lunr.js',
'onadata/apps/main/static/bower_components/backgrid/assets/js/backbone-pageable.js',
'onadata/apps/main/static/bower_components/backgrid/lib/extensions/filter/backgrid-filter.js',
'onadata/apps/main/static/bower_components/backgrid/lib/extensions/paginator/backgrid-paginator.js',
'onadata/apps/main/static/bower_components/leaflet-dist/leaflet-src.js',
'https://maps.google.com/maps/api/js?v=3.2&sensor=false',
'main/static/js/dv.js',
'main/static/js/Google.js',
'onadata/apps/main/static/js/dv.js',
'onadata/apps/main/static/js/Google.js',
'node_modules/sinon/lib/sinon.js',
'node_modules/sinon/lib/sinon/util/event.js',
'node_modules/sinon/lib/sinon/util/fake_xml_http_request.js',
'node_modules/sinon/lib/sinon/util/fake_server.js',
'odk_viewer/static/js/map.js',
'odk_viewer/static/js/xform.js',
'odk_viewer/static/js/data_view.js',
'odk_viewer/js_tests/spec/*.spec.js',
'odk_viewer/js_tests/mock/*.js'
'onadata/apps/odk_viewer/static/js/map.js',
'onadata/apps/odk_viewer/static/js/xform.js',
'onadata/apps/odk_viewer/static/js/data_view.js',
'onadata/libs/javascript/tests/spec/*.spec.js',
'onadata/libs/javascript/tests/mock/*.js'
],


Expand Down
0 ...dk_viewer/js_tests/mock/responses.mock.js → ...s/javascript/tests/mock/responses.mock.js
View file
File renamed without changes.
0 ...dk_viewer/js_tests/spec/data_view.spec.js → ...s/javascript/tests/spec/data_view.spec.js
View file
File renamed without changes.
0 ...odk_viewer/js_tests/spec/datavore.spec.js → ...bs/javascript/tests/spec/datavore.spec.js
View file
File renamed without changes.
0 ...apps/odk_viewer/js_tests/spec/map.spec.js → ...ta/libs/javascript/tests/spec/map.spec.js
View file
File renamed without changes.
0 ...ta/apps/odk_viewer/js_tests/xform.spec.js → onadata/libs/javascript/tests/xform.spec.js
View file
File renamed without changes.

0 comments on commit e8e8244

Please sign in to comment.