Skip to content

Commit 20c7801

Browse files
committed
refs matomo-org#6469 some initial work for using bower
1 parent a3063de commit 20c7801

File tree

1,057 files changed

+138190
-39074
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,057 files changed

+138190
-39074
lines changed

.bowerrc

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"directory": "libs/bower_components",
3+
"analytics": false
4+
}

bower.json

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"name": "Piwik",
3+
"main": "piwik.js",
4+
"homepage": "http://piwik.org",
5+
"authors": [
6+
"Piwik.org <[email protected]>"
7+
],
8+
"description": "the leading free/libre analytics platform",
9+
"private": true,
10+
"keywords": [
11+
"piwik",
12+
"web",
13+
"analytics"
14+
],
15+
"dependencies": {
16+
"jquery": "~1.11",
17+
"angular": "~1.2",
18+
"angular-sanitize": "~1.2",
19+
"angular-animate": "~1.2",
20+
"angular-cookies": "~1.2",
21+
"angular-mocks": "~1.2",
22+
"ngDialog": "~0.2",
23+
"html5shiv": "~3.7",
24+
"mousetrap": "~1.4",
25+
"sprintf": "~1.0.0",
26+
"jScrollPane": "~2.0.14",
27+
"jquery-mousewheel": "~3.1.12",
28+
"jquery-placeholder": "~2.0.8",
29+
"jquery.scrollTo": "~1.4.13",
30+
"jquery-ui": "~1.11.2",
31+
"chroma-js": "~0.6.0"
32+
},
33+
"license": "GPLv3 or later",
34+
"ignore": [
35+
"**/.*",
36+
"node_modules",
37+
"bower_components",
38+
"test",
39+
"tests"
40+
]
41+
}

core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ protected function addThemeFiles()
7373
protected function getPriorityOrder()
7474
{
7575
return array(
76-
'libs/jquery/jquery.js',
77-
'libs/jquery/jquery-ui.js',
76+
'libs/bower_components/jquery/dist/jquery.min.js',
77+
'libs/bower_components/jquery-ui/jquery-ui.min.js',
7878
'libs/jquery/jquery.browser.js',
7979
'libs/',
8080
'plugins/CoreHome/javascripts/require.js',

0 commit comments

Comments
 (0)