summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-05-04 23:01:24 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-05-06 13:00:14 -0400
commita10d8100b700f609d092c2d99d16c7bd23d8a206 (patch)
tree64a0c4e60c358b95cc2c331cdb48d65ad5597dc2 /vendor
parentf3d63eeb181db1c089bf9e4f5c0e296f6ca6230b (diff)
downloadgitlab-ce-a10d8100b700f609d092c2d99d16c7bd23d8a206.tar.gz
Update jasmine-fixture
Diffstat (limited to 'vendor')
-rwxr-xr-x[-rw-r--r--]vendor/assets/javascripts/jasmine-fixture.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/vendor/assets/javascripts/jasmine-fixture.js b/vendor/assets/javascripts/jasmine-fixture.js
index 3815731fd2f..9980aec6ddb 100644..100755
--- a/vendor/assets/javascripts/jasmine-fixture.js
+++ b/vendor/assets/javascripts/jasmine-fixture.js
@@ -1,4 +1,4 @@
-/* jasmine-fixture - 1.2.2
+/* jasmine-fixture - 1.3.1
* Makes injecting HTML snippets into the DOM easy & clean!
* https://github.com/searls/jasmine-fixture
*/
@@ -8,7 +8,7 @@
(function($) {
var ewwSideEffects, jasmineFixture, originalAffix, originalJasmineDotFixture, originalJasmineFixture, root, _, _ref;
- root = this;
+ root = (1, eval)('this');
originalJasmineFixture = root.jasmineFixture;
originalJasmineDotFixture = (_ref = root.jasmine) != null ? _ref.fixture : void 0;
originalAffix = root.affix;
@@ -33,7 +33,7 @@
create = function(selectorOptions, attach) {
var $top;
$top = null;
- _(selectorOptions.split(/[ ](?=[^\]]*?(?:\[|$))/)).inject(function($parent, elementSelector) {
+ _(selectorOptions.split(/[ ](?![^\{]*\})(?=[^\]]*?(?:\[|$))/)).inject(function($parent, elementSelector) {
var $el;
if (elementSelector === ">") {
return $parent;