Skip to content

Commit

Permalink
refs matomo-org#6469 some initial work for using bower
Browse files Browse the repository at this point in the history
  • Loading branch information
tsteur committed Oct 20, 2014
1 parent a3063de commit 20c7801
Show file tree
Hide file tree
Showing 1,057 changed files with 138,190 additions and 39,074 deletions.
4 changes: 4 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"directory": "libs/bower_components",
"analytics": false
}
41 changes: 41 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"name": "Piwik",
"main": "piwik.js",
"homepage": "http://piwik.org",
"authors": [
"Piwik.org <[email protected]>"
],
"description": "the leading free/libre analytics platform",
"private": true,
"keywords": [
"piwik",
"web",
"analytics"
],
"dependencies": {
"jquery": "~1.11",
"angular": "~1.2",
"angular-sanitize": "~1.2",
"angular-animate": "~1.2",
"angular-cookies": "~1.2",
"angular-mocks": "~1.2",
"ngDialog": "~0.2",
"html5shiv": "~3.7",
"mousetrap": "~1.4",
"sprintf": "~1.0.0",
"jScrollPane": "~2.0.14",
"jquery-mousewheel": "~3.1.12",
"jquery-placeholder": "~2.0.8",
"jquery.scrollTo": "~1.4.13",
"jquery-ui": "~1.11.2",
"chroma-js": "~0.6.0"
},
"license": "GPLv3 or later",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
]
}
4 changes: 2 additions & 2 deletions core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ protected function addThemeFiles()
protected function getPriorityOrder()
{
return array(
'libs/jquery/jquery.js',
'libs/jquery/jquery-ui.js',
'libs/bower_components/jquery/dist/jquery.min.js',
'libs/bower_components/jquery-ui/jquery-ui.min.js',
'libs/jquery/jquery.browser.js',
'libs/',
'plugins/CoreHome/javascripts/require.js',
Expand Down
Loading

0 comments on commit 20c7801

Please sign in to comment.