From a10d8100b700f609d092c2d99d16c7bd23d8a206 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 4 May 2015 23:01:24 -0400
Subject: Update jasmine-fixture

---
 vendor/assets/javascripts/jasmine-fixture.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 vendor/assets/javascripts/jasmine-fixture.js

diff --git a/vendor/assets/javascripts/jasmine-fixture.js b/vendor/assets/javascripts/jasmine-fixture.js
old mode 100644
new mode 100755
index 3815731fd2f..9980aec6ddb
--- 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;
-- 
cgit v1.2.1