components/openstack/horizon/patches/04-remove-jasmine.patch
branchs11-update
changeset 4072 db0cec748ec0
equal deleted inserted replaced
4067:4be1f488dda8 4072:db0cec748ec0
       
     1 In-house patch to remove jasmine.js from Horizon.  This JavaScript
       
     2 library is only used for testing and not used by Horizon during normal
       
     3 operation.
       
     4 
       
     5 --- horizon-2014.2.1/horizon/site_urls.py.orig    2015-02-02 15:31:57.209242227 -0700
       
     6 +++ horizon-2014.2.1/horizon/site_urls.py        2015-02-02 15:32:11.276168850 -0700
       
     7 @@ -22,8 +22,6 @@ from django.conf.urls import patterns
       
     8  from django.conf.urls import url
       
     9  from django.views.generic import TemplateView  # noqa
       
    10 
       
    11 -from horizon.test.jasmine import jasmine
       
    12 -
       
    13  urlpatterns = patterns('horizon.views',
       
    14      url(r'^home/$', 'user_home', name='user_home')
       
    15  )
       
    16 @@ -38,7 +36,3 @@ urlpatterns += patterns('',
       
    17          name="set_language"),
       
    18      url(r'^i18n/', include('django.conf.urls.i18n'))
       
    19  )
       
    20 -
       
    21 -if settings.DEBUG:
       
    22 -    urlpatterns += patterns('',
       
    23 -        url(r'^jasmine/(.*?)$', jasmine.dispatcher))
       
    24 
       
    25 --- horizon-2014.2.1/openstack_dashboard/settings.py.orig 2015-02-02 15:33:37.928460972 -0700
       
    26 +++ horizon-2014.2.1/openstack_dashboard/settings.py 2015-02-02 15:33:58.344285143 -0700
       
    27 @@ -29,7 +29,6 @@ import xstatic.pkg.bootstrap_scss
       
    28  import xstatic.pkg.d3
       
    29  import xstatic.pkg.font_awesome
       
    30  import xstatic.pkg.hogan
       
    31 -import xstatic.pkg.jasmine
       
    32  import xstatic.pkg.jquery
       
    33  import xstatic.pkg.jquery_migrate
       
    34  import xstatic.pkg.jquery_quicksearch
       
    35 @@ -162,8 +161,6 @@ STATICFILES_DIRS = [
       
    36          xstatic.main.XStatic(xstatic.pkg.hogan).base_dir),
       
    37      ('horizon/lib/font-awesome',
       
    38          xstatic.main.XStatic(xstatic.pkg.font_awesome).base_dir),
       
    39 -    ('horizon/lib/jasmine-1.3.1',
       
    40 -        xstatic.main.XStatic(xstatic.pkg.jasmine).base_dir),
       
    41      ('horizon/lib/jquery',
       
    42          xstatic.main.XStatic(xstatic.pkg.jquery).base_dir),
       
    43      ('horizon/lib/jquery',