diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2014-10-21 23:45:04 +0400 |
|---|---|---|
| committer | Thomas Steur <tsteur@users.noreply.github.com> | 2014-10-21 23:45:04 +0400 |
| commit | e231e02da9b77c59f6b250ac4a3aadde18d09c79 (patch) | |
| tree | 95664c85dd9032a13fee1bf0a22b8bf88d868044 /core | |
| parent | 9fef02e4483bae2f252b8316b208aa392cb7e11b (diff) | |
| parent | 5f4e034e2454c9d1bb591badb308de7e07ca6d8f (diff) | |
Merge pull request #6483 from piwik/introducingBower
Introducing bower
Diffstat (limited to 'core')
| -rw-r--r-- | core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php b/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php index 5600068e44..64f8e0506f 100644 --- a/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php +++ b/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php @@ -73,8 +73,8 @@ class JScriptUIAssetFetcher extends UIAssetFetcher 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/ui/minified/jquery-ui.min.js', 'libs/jquery/jquery.browser.js', 'libs/', 'plugins/CoreHome/javascripts/require.js', |