Skip to content

Commit

Permalink
[1.9.x] Refs #16501, #26474 -- Added xregexp.js source file.
Browse files Browse the repository at this point in the history
Backport of 054e744 from master
  • Loading branch information
knightrix authored and timgraham committed Jun 6, 2016
1 parent 36b9e4a commit 307de7d
Show file tree
Hide file tree
Showing 3 changed files with 2,311 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
**/{*.min,jquery}.js
**/*.min.js
**/vendor/**/*.js
django/contrib/gis/templates/**/*.js
node_modules/**.js
2 changes: 1 addition & 1 deletion django/contrib/admin/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ def media(self):
'actions%s.js' % extra,
'urlify.js',
'prepopulate%s.js' % extra,
'vendor/xregexp/xregexp.min.js',
'vendor/xregexp/xregexp%s.js' % extra,
]
return forms.Media(js=[static('admin/js/%s' % url) for url in js])

Expand Down

0 comments on commit 307de7d

Please sign in to comment.