openstack/horizon
Code Issues Proposed changes

Merge "Unbundle jquery from horizon using xstatic"

Browse Source
This commit is contained in:
Jenkins
2014-07-04 18:40:44 +00:00
committed by Gerrit Code Review
parent c3d5e1109f 802caf23d7
commit 0c04a62e78
4 changed files with 16 additions and 9789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9789
horizon/static/horizon/lib/jquery/jquery.js vendored
View File

File diff suppressed because it is too large Load Diff

7
horizon/test/settings.py
View File

@@ -23,6 +23,9 @@ import sys
import django import django
from django.utils import html_parser from django.utils import html_parser
from horizon.test import patches from horizon.test import patches
import xstatic.main
import xstatic.pkg.jquery
# Patch django.utils.html_parser.HTMLParser as a workaround for bug 1273943 # Patch django.utils.html_parser.HTMLParser as a workaround for bug 1273943
if django.get_version() == '1.4' and sys.version_info[:3] > (2, 7, 3): if django.get_version() == '1.4' and sys.version_info[:3] > (2, 7, 3):
@@ -135,6 +138,10 @@ STATICFILES_FINDERS = (
'compressor.finders.CompressorFinder', 'compressor.finders.CompressorFinder',
) )
STATICFILES_DIRS = (
('horizon/lib/jquery', xstatic.main.XStatic(xstatic.pkg.jquery).base_dir),
)
LOGGING = { LOGGING = {
'version': 1, 'version': 1,
'disable_existing_loggers': False, 'disable_existing_loggers': False,

7
openstack_dashboard/settings.py
View File

@@ -22,6 +22,8 @@ import sys
import warnings import warnings
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
import xstatic.main
import xstatic.pkg.jquery
from openstack_dashboard import exceptions from openstack_dashboard import exceptions
@@ -129,9 +131,14 @@ TEMPLATE_DIRS = (
STATICFILES_FINDERS = ( STATICFILES_FINDERS = (
'compressor.finders.CompressorFinder', 'compressor.finders.CompressorFinder',
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
) )
STATICFILES_DIRS = (
('horizon/lib/jquery', xstatic.main.XStatic(xstatic.pkg.jquery).base_dir),
)
COMPRESS_PRECOMPILERS = ( COMPRESS_PRECOMPILERS = (
('text/less', 'lesscpy {infile}'), ('text/less', 'lesscpy {infile}'),
('text/scss', 'django_pyscss.compressor.DjangoScssFilter'), ('text/scss', 'django_pyscss.compressor.DjangoScssFilter'),

2
requirements.txt
View File

@@ -25,3 +25,5 @@ python-swiftclient>=2.0.2
python-troveclient>=1.0.4 python-troveclient>=1.0.4
pytz>=2010h pytz>=2010h
six>=1.7.0 six>=1.7.0
xstatic>=1.0.0
xstatic-jquery>=1.10.2.1