components/openstack/horizon/patches/02-remove_js.patch
changeset 5405 66fd59fecd68
child 6856 356aeea98c39
equal deleted inserted replaced
5404:55e409ba4e72 5405:66fd59fecd68
       
     1 In-house patch to remove unneeded JS libraries.
       
     2 
       
     3 --- horizon-2015.1.0/horizon/site_urls.py.orig      2015-05-01 14:03:57.627879183 -0600
       
     4 +++ horizon-2015.1.0/horizon/site_urls.py        2015-05-01 14:04:00.275015653 -0600
       
     5 @@ -22,8 +22,6 @@ from django.conf.urls import patterns
       
     6  from django.conf.urls import url
       
     7  from django.views.generic import TemplateView  # noqa
       
     8 
       
     9 -from horizon.test.jasmine import jasmine
       
    10 -
       
    11  urlpatterns = patterns(
       
    12      'horizon.views',
       
    13      url(r'^home/$', 'user_home', name='user_home')
       
    14 @@ -40,11 +38,3 @@ urlpatterns += patterns(
       
    15          name="set_language"),
       
    16      url(r'^i18n/', include('django.conf.urls.i18n'))
       
    17  )
       
    18 -
       
    19 -if settings.DEBUG:
       
    20 -    urlpatterns += patterns(
       
    21 -        '',
       
    22 -        url(r'^qunit/$',
       
    23 -            TemplateView.as_view(template_name="horizon/qunit.html"),
       
    24 -            name='qunit_tests'),
       
    25 -        url(r'^jasmine/(.*?)$', jasmine.dispatcher))
       
    26 
       
    27 --- horizon-2015.1.0/openstack_dashboard/static_settings.py.orig    2015-05-01 14:06:07.878347595 -0600
       
    28 +++ horizon-2015.1.0/openstack_dashboard/static_settings.py  2015-05-01 14:06:54.565608248 -0600
       
    29 @@ -27,7 +27,6 @@ import xstatic.pkg.bootstrap_scss
       
    30  import xstatic.pkg.d3
       
    31  import xstatic.pkg.font_awesome
       
    32  import xstatic.pkg.hogan
       
    33 -import xstatic.pkg.jasmine
       
    34  import xstatic.pkg.jquery
       
    35  import xstatic.pkg.jquery_migrate
       
    36  import xstatic.pkg.jquery_quicksearch
       
    37 @@ -35,7 +34,6 @@ import xstatic.pkg.jquery_tablesorter
       
    38  import xstatic.pkg.jquery_ui
       
    39  import xstatic.pkg.jsencrypt
       
    40  import xstatic.pkg.magic_search
       
    41 -import xstatic.pkg.qunit
       
    42  import xstatic.pkg.rickshaw
       
    43  import xstatic.pkg.spin
       
    44  import xstatic.pkg.termjs
       
    45 @@ -70,9 +68,6 @@ def get_staticfiles_dirs(webroot='/'):
       
    46          ('horizon/lib/font-awesome',
       
    47              xstatic.main.XStatic(xstatic.pkg.font_awesome,
       
    48                                   root_url=webroot).base_dir),
       
    49 -        ('horizon/lib/jasmine',
       
    50 -            xstatic.main.XStatic(xstatic.pkg.jasmine,
       
    51 -                                 root_url=webroot).base_dir),
       
    52          ('horizon/lib/jquery',
       
    53              xstatic.main.XStatic(xstatic.pkg.jquery,
       
    54                                   root_url=webroot).base_dir),
       
    55 @@ -91,9 +86,6 @@ def get_staticfiles_dirs(webroot='/'):
       
    56          ('horizon/lib/magic_search',
       
    57              xstatic.main.XStatic(xstatic.pkg.magic_search,
       
    58                                   root_url=webroot).base_dir),
       
    59 -        ('horizon/lib/qunit',
       
    60 -            xstatic.main.XStatic(xstatic.pkg.qunit,
       
    61 -                                 root_url=webroot).base_dir),
       
    62          ('horizon/lib',
       
    63              xstatic.main.XStatic(xstatic.pkg.rickshaw,
       
    64                                   root_url=webroot).base_dir),