qedproject 0.3.2 → 0.4.0

data/bin/qedproject

@@ -53,7 +53,11 @@ OptionParser.new do |opts|
   opts.on('--server', 'start a webserver that serves public/') do
     options[:server] = true
   end
-
+  
+  opts.on('-q','--qedserver', 'Installs QEDServer into the project') do
+    options[:qedserver] = true
+  end
+  
 end.parse!
 if options[:server]
   require 'webrick'

data/lib/qedproject/libraries/jquery.rb

@@ -2,7 +2,7 @@ module QEDProject
   module Libraries
     class JQuery < QEDProject::Libraries::Base
       library :jquery
-      set_js_files ["jquery-1.7.0.min.js"]
+      set_js_files ["jquery-1.8.2.min.js"]
     end
   end
 end

data/lib/qedproject/libraries/jquerymobile.rb

@@ -3,10 +3,10 @@ module QEDProject
     class Jquerymobile < QEDProject::Libraries::Base
       library :jquerymobile
       depends_on [:jquery]
-      set_js_files ["jquery.mobile-1.1.0.js"]
-      set_css_files ["jquery.mobile-1.1.0.css" ] 
+      set_js_files ["jquery.mobile-1.2.0.js"]
+      set_css_files ["jquery.mobile-1.2.0.css" ] 
       set_image_files [
-        "ajax-loader.png",
+        "ajax-loader.gif",
         "icons-18-black.png",
         "icons-18-white.png",
         "icons-36-black.png",

data/lib/qedproject/libraries/skeleton.rb

@@ -3,7 +3,7 @@ module QEDProject
     class Skeleton < QEDProject::Libraries::Base
       library :skeleton
       depends_on [:jquery]
-      set_js_files ["tabs.js"]
+      set_js_files []
       set_css_files ["base.css", "skeleton.css", "layout.css" ] 
       set_image_files [
         "apple-touch-icon-114x114.png",

data/lib/qedproject/project.rb

@@ -132,7 +132,7 @@ module QEDProject
         cp_r File.join(self.vendor_root, "jasmine-jquery", "jasmine-jquery.js"), File.join(self.path, "spec", "lib"), :verbose => self.verbose
       end
 
-      render_template_to_file "suite.html", File.join(self.path, "spec", "suite.html"), binding
+      render_template_to_file "suite.html", File.join(self.path, "spec", "SpecRunner.html"), binding
       if self.coffeescript
         render_template_to_file "sampleSpec.coffee", File.join(self.path, "spec", "sampleSpec.coffee"), binding
       else
@@ -158,7 +158,7 @@ module QEDProject
       mkdir_p( self.path, :verbose => self.verbose)
       mkdir_p( File.join(self.path, self.public_dir), :verbose => self.verbose)
       mkdir_p( File.join(self.path, self.images_path), :verbose => self.verbose)
-      mkdir_p( File.join(self.path, "tmp"), :verbose => self.verbose)
+      mkdir_p( File.join(self.path, "_qedtmp"), :verbose => self.verbose)
       mkdir_p( File.join(self.path, self.js_path), :verbose => self.verbose)
       mkdir_p( File.join(self.path, self.css_path), :verbose => self.verbose)
       mkdir_p( File.join(self.path, "config"), :verbose => self.verbose) if self.needs_config_folder?

data/lib/qedproject/version.rb

@@ -1,3 +1,3 @@
 module QEDProject
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/templates/Guardfile

@@ -1,13 +1,13 @@
 <% if self.sass -%>
 <% if self.jammit -%>
-guard "sass", :input => "sass", :output => "tmp"
+guard "sass", :input => "sass", :output => "_qedtmp"
 <% else -%>
 guard "sass", :input => "sass", :output => "public/stylesheets"
 <% end -%>
 <% end -%>
 <% if self.coffeescript -%>
 <% if self.jammit -%>
-guard "coffeescript", :input => "coffeescripts", :output => "tmp"
+guard "coffeescript", :input => "coffeescripts", :output => "_qedtmp"
 <% else -%>
 guard "coffeescript", :input => "coffeescripts", :output => "public/javascripts"
 <% end -%>
@@ -20,14 +20,15 @@ guard "jammit", :force => true do
   watch(/^javascripts\/(.*)\.js/)
   watch(/^stylesheets\/(.*)\.css/)
 <% if self.coffeescript -%>
-  watch(/^tmp\/(.*)\.js/)
+  watch(/^_qedtmp\/(.*)\.js/)
 <% end -%>
 <% if self.sass -%>
-  watch(/^tmp\/(.*)\.css/)
+  watch(/^_qedtmp\/(.*)\.css/)
 <% end -%>
 end
 <% end -%>
 
+<% if self.livereload -%>
 guard 'livereload' do
   watch(%r{public/.+\.(css|js|html)})
 <% if self.jammit -%>
@@ -39,4 +40,5 @@ guard 'livereload' do
 <% if self.testing -%>
   watch(%r{spec/.+\.(|js|html)})  
 <% end -%>
-end
+end
+<% end -%>

data/templates/assets.yml

@@ -4,7 +4,7 @@ stylesheets:
   - <%=File.join(self.css_path, lib) %>
   <% end -%>
 <% if self.sass -%>
-  - <%= File.join("tmp", "app.css") %>
+  - <%= File.join("_qedtmp", "app.css") %>
 <% else -%>
   - <%= File.join(self.css_path, "app.css") %>
 <% end -%>
@@ -15,7 +15,7 @@ javascripts:
   - <%=File.join(self.js_path, lib) %>
   <% end -%>
 <% if self.coffeescript -%>
-  - <%= File.join("tmp", "app.js") %>
+  - <%= File.join("_qedtmp", "app.js") %>
 <% else -%>
   - <%= File.join(self.js_path, "app.js") %>
 <% end -%>

data/templates/sampleSpec.js

@@ -1,7 +1,6 @@
-(function() {
-  describe("A sample spec", function() {
-    return it("performs addition", function() {
-      return (expect(1 + 1)).toEqual(3);
-    });
+describe("A sample spec", function() {
+  return it("performs addition", function() {
+    return (expect(1 + 1)).toEqual(3);
   });
-}).call(this);
+});
+

data/templates/suite.html

@@ -2,9 +2,9 @@
 <html>
 <head>
   <title>Jasmine Test Runner</title>
-  <link rel="stylesheet" type="text/css" href="lib/jasmine-1.1.0/jasmine.css">
-  <script type="text/javascript" src="lib/jasmine-1.1.0/jasmine.js"></script>
-  <script type="text/javascript" src="lib/jasmine-1.1.0/jasmine-html.js"></script>
+   <link rel="stylesheet" type="text/css" href="lib/jasmine-1.2.0/jasmine.css">
+   <script type="text/javascript" src="lib/jasmine-1.2.0/jasmine.js"></script>
+   <script type="text/javascript" src="lib/jasmine-1.2.0/jasmine-html.js"></script>
   <% if @project.uses_jquery? -%>
   <script type="text/javascript" src="lib/jasmine-jquery.js"></script>
   <% end -%>
@@ -19,38 +19,38 @@
   <% end -%>
   <!-- include spec files here... -->
   <script type="text/javascript" src="sampleSpec.js"></script>
+  
+  <!-- Jasmine runner -->
+  <script type="text/javascript">
+    (function() {
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.updateInterval = 1000;
 
-</head>
-<body>
+      var htmlReporter = new jasmine.HtmlReporter();
 
-<script type="text/javascript">
-  (function() {
-    var jasmineEnv = jasmine.getEnv();
-    jasmineEnv.updateInterval = 1000;
+      jasmineEnv.addReporter(htmlReporter);
 
-    var trivialReporter = new jasmine.TrivialReporter();
+      jasmineEnv.specFilter = function(spec) {
+        return htmlReporter.specFilter(spec);
+      };
 
-    jasmineEnv.addReporter(trivialReporter);
+      var currentWindowOnload = window.onload;
 
-    jasmineEnv.specFilter = function(spec) {
-      return trivialReporter.specFilter(spec);
-    };
+      window.onload = function() {
+        if (currentWindowOnload) {
+          currentWindowOnload();
+        }
+        execJasmine();
+      };
 
-    var currentWindowOnload = window.onload;
-
-    window.onload = function() {
-      if (currentWindowOnload) {
-        currentWindowOnload();
+      function execJasmine() {
+        jasmineEnv.execute();
       }
-      execJasmine();
-    };
-
-    function execJasmine() {
-      jasmineEnv.execute();
-    }
-
-  })();
-</script>
 
+    })();
+  </script>
+</head>
+<body>
+  
 </body>
 </html>

data/vendor/jasmine/lib/{jasmine-1.1.0 → jasmine-1.2.0}/jasmine-html.js

@@ -158,67 +158,7 @@ jasmine.HtmlReporter = function(_doc) {
     );
   }
 };
-jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter);jasmine.HtmlReporterHelpers = {};
-
-jasmine.HtmlReporterHelpers.createDom = function(type, attrs, childrenVarArgs) {
-  var el = document.createElement(type);
-
-  for (var i = 2; i < arguments.length; i++) {
-    var child = arguments[i];
-
-    if (typeof child === 'string') {
-      el.appendChild(document.createTextNode(child));
-    } else {
-      if (child) {
-        el.appendChild(child);
-      }
-    }
-  }
-
-  for (var attr in attrs) {
-    if (attr == "className") {
-      el[attr] = attrs[attr];
-    } else {
-      el.setAttribute(attr, attrs[attr]);
-    }
-  }
-
-  return el;
-};
-
-jasmine.HtmlReporterHelpers.getSpecStatus = function(child) {
-  var results = child.results();
-  var status = results.passed() ? 'passed' : 'failed';
-  if (results.skipped) {
-    status = 'skipped';
-  }
-
-  return status;
-};
-
-jasmine.HtmlReporterHelpers.appendToSummary = function(child, childElement) {
-  var parentDiv = this.dom.summary;
-  var parentSuite = (typeof child.parentSuite == 'undefined') ? 'suite' : 'parentSuite';
-  var parent = child[parentSuite];
-
-  if (parent) {
-    if (typeof this.views.suites[parent.id] == 'undefined') {
-      this.views.suites[parent.id] = new jasmine.HtmlReporter.SuiteView(parent, this.dom, this.views);
-    }
-    parentDiv = this.views.suites[parent.id].element;
-  }
-
-  parentDiv.appendChild(childElement);
-};
-
-
-jasmine.HtmlReporterHelpers.addHelpers = function(ctor) {
-  for(var fn in jasmine.HtmlReporterHelpers) {
-    ctor.prototype[fn] = jasmine.HtmlReporterHelpers[fn];
-  }
-};
-
-jasmine.HtmlReporter.ReporterView = function(dom) {
+jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter);jasmine.HtmlReporter.ReporterView = function(dom) {
   this.startedAt = new Date();
   this.runningSpecCount = 0;
   this.completeSpecCount = 0;

data/vendor/jasmine/lib/{jasmine-1.1.0 → jasmine-1.2.0}/jasmine.js

@@ -1529,6 +1529,189 @@ jasmine.Matchers.ObjectContaining.prototype.jasmineMatches = function(other, mis
 jasmine.Matchers.ObjectContaining.prototype.jasmineToString = function () {
   return "<jasmine.objectContaining(" + jasmine.pp(this.sample) + ")>";
 };
+// Mock setTimeout, clearTimeout
+// Contributed by Pivotal Computer Systems, www.pivotalsf.com
+
+jasmine.FakeTimer = function() {
+  this.reset();
+
+  var self = this;
+  self.setTimeout = function(funcToCall, millis) {
+    self.timeoutsMade++;
+    self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false);
+    return self.timeoutsMade;
+  };
+
+  self.setInterval = function(funcToCall, millis) {
+    self.timeoutsMade++;
+    self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true);
+    return self.timeoutsMade;
+  };
+
+  self.clearTimeout = function(timeoutKey) {
+    self.scheduledFunctions[timeoutKey] = jasmine.undefined;
+  };
+
+  self.clearInterval = function(timeoutKey) {
+    self.scheduledFunctions[timeoutKey] = jasmine.undefined;
+  };
+
+};
+
+jasmine.FakeTimer.prototype.reset = function() {
+  this.timeoutsMade = 0;
+  this.scheduledFunctions = {};
+  this.nowMillis = 0;
+};
+
+jasmine.FakeTimer.prototype.tick = function(millis) {
+  var oldMillis = this.nowMillis;
+  var newMillis = oldMillis + millis;
+  this.runFunctionsWithinRange(oldMillis, newMillis);
+  this.nowMillis = newMillis;
+};
+
+jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMillis) {
+  var scheduledFunc;
+  var funcsToRun = [];
+  for (var timeoutKey in this.scheduledFunctions) {
+    scheduledFunc = this.scheduledFunctions[timeoutKey];
+    if (scheduledFunc != jasmine.undefined &&
+        scheduledFunc.runAtMillis >= oldMillis &&
+        scheduledFunc.runAtMillis <= nowMillis) {
+      funcsToRun.push(scheduledFunc);
+      this.scheduledFunctions[timeoutKey] = jasmine.undefined;
+    }
+  }
+
+  if (funcsToRun.length > 0) {
+    funcsToRun.sort(function(a, b) {
+      return a.runAtMillis - b.runAtMillis;
+    });
+    for (var i = 0; i < funcsToRun.length; ++i) {
+      try {
+        var funcToRun = funcsToRun[i];
+        this.nowMillis = funcToRun.runAtMillis;
+        funcToRun.funcToCall();
+        if (funcToRun.recurring) {
+          this.scheduleFunction(funcToRun.timeoutKey,
+              funcToRun.funcToCall,
+              funcToRun.millis,
+              true);
+        }
+      } catch(e) {
+      }
+    }
+    this.runFunctionsWithinRange(oldMillis, nowMillis);
+  }
+};
+
+jasmine.FakeTimer.prototype.scheduleFunction = function(timeoutKey, funcToCall, millis, recurring) {
+  this.scheduledFunctions[timeoutKey] = {
+    runAtMillis: this.nowMillis + millis,
+    funcToCall: funcToCall,
+    recurring: recurring,
+    timeoutKey: timeoutKey,
+    millis: millis
+  };
+};
+
+/**
+ * @namespace
+ */
+jasmine.Clock = {
+  defaultFakeTimer: new jasmine.FakeTimer(),
+
+  reset: function() {
+    jasmine.Clock.assertInstalled();
+    jasmine.Clock.defaultFakeTimer.reset();
+  },
+
+  tick: function(millis) {
+    jasmine.Clock.assertInstalled();
+    jasmine.Clock.defaultFakeTimer.tick(millis);
+  },
+
+  runFunctionsWithinRange: function(oldMillis, nowMillis) {
+    jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis);
+  },
+
+  scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) {
+    jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring);
+  },
+
+  useMock: function() {
+    if (!jasmine.Clock.isInstalled()) {
+      var spec = jasmine.getEnv().currentSpec;
+      spec.after(jasmine.Clock.uninstallMock);
+
+      jasmine.Clock.installMock();
+    }
+  },
+
+  installMock: function() {
+    jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer;
+  },
+
+  uninstallMock: function() {
+    jasmine.Clock.assertInstalled();
+    jasmine.Clock.installed = jasmine.Clock.real;
+  },
+
+  real: {
+    setTimeout: jasmine.getGlobal().setTimeout,
+    clearTimeout: jasmine.getGlobal().clearTimeout,
+    setInterval: jasmine.getGlobal().setInterval,
+    clearInterval: jasmine.getGlobal().clearInterval
+  },
+
+  assertInstalled: function() {
+    if (!jasmine.Clock.isInstalled()) {
+      throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()");
+    }
+  },
+
+  isInstalled: function() {
+    return jasmine.Clock.installed == jasmine.Clock.defaultFakeTimer;
+  },
+
+  installed: null
+};
+jasmine.Clock.installed = jasmine.Clock.real;
+
+//else for IE support
+jasmine.getGlobal().setTimeout = function(funcToCall, millis) {
+  if (jasmine.Clock.installed.setTimeout.apply) {
+    return jasmine.Clock.installed.setTimeout.apply(this, arguments);
+  } else {
+    return jasmine.Clock.installed.setTimeout(funcToCall, millis);
+  }
+};
+
+jasmine.getGlobal().setInterval = function(funcToCall, millis) {
+  if (jasmine.Clock.installed.setInterval.apply) {
+    return jasmine.Clock.installed.setInterval.apply(this, arguments);
+  } else {
+    return jasmine.Clock.installed.setInterval(funcToCall, millis);
+  }
+};
+
+jasmine.getGlobal().clearTimeout = function(timeoutKey) {
+  if (jasmine.Clock.installed.clearTimeout.apply) {
+    return jasmine.Clock.installed.clearTimeout.apply(this, arguments);
+  } else {
+    return jasmine.Clock.installed.clearTimeout(timeoutKey);
+  }
+};
+
+jasmine.getGlobal().clearInterval = function(timeoutKey) {
+  if (jasmine.Clock.installed.clearTimeout.apply) {
+    return jasmine.Clock.installed.clearInterval.apply(this, arguments);
+  } else {
+    return jasmine.Clock.installed.clearInterval(timeoutKey);
+  }
+};
+
 /**
  * @constructor
  */
@@ -2337,192 +2520,10 @@ jasmine.WaitsForBlock.prototype.execute = function(onComplete) {
     }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
   }
 };
-// Mock setTimeout, clearTimeout
-// Contributed by Pivotal Computer Systems, www.pivotalsf.com
-
-jasmine.FakeTimer = function() {
-  this.reset();
-
-  var self = this;
-  self.setTimeout = function(funcToCall, millis) {
-    self.timeoutsMade++;
-    self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false);
-    return self.timeoutsMade;
-  };
-
-  self.setInterval = function(funcToCall, millis) {
-    self.timeoutsMade++;
-    self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true);
-    return self.timeoutsMade;
-  };
-
-  self.clearTimeout = function(timeoutKey) {
-    self.scheduledFunctions[timeoutKey] = jasmine.undefined;
-  };
-
-  self.clearInterval = function(timeoutKey) {
-    self.scheduledFunctions[timeoutKey] = jasmine.undefined;
-  };
-
-};
-
-jasmine.FakeTimer.prototype.reset = function() {
-  this.timeoutsMade = 0;
-  this.scheduledFunctions = {};
-  this.nowMillis = 0;
-};
-
-jasmine.FakeTimer.prototype.tick = function(millis) {
-  var oldMillis = this.nowMillis;
-  var newMillis = oldMillis + millis;
-  this.runFunctionsWithinRange(oldMillis, newMillis);
-  this.nowMillis = newMillis;
-};
-
-jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMillis) {
-  var scheduledFunc;
-  var funcsToRun = [];
-  for (var timeoutKey in this.scheduledFunctions) {
-    scheduledFunc = this.scheduledFunctions[timeoutKey];
-    if (scheduledFunc != jasmine.undefined &&
-        scheduledFunc.runAtMillis >= oldMillis &&
-        scheduledFunc.runAtMillis <= nowMillis) {
-      funcsToRun.push(scheduledFunc);
-      this.scheduledFunctions[timeoutKey] = jasmine.undefined;
-    }
-  }
-
-  if (funcsToRun.length > 0) {
-    funcsToRun.sort(function(a, b) {
-      return a.runAtMillis - b.runAtMillis;
-    });
-    for (var i = 0; i < funcsToRun.length; ++i) {
-      try {
-        var funcToRun = funcsToRun[i];
-        this.nowMillis = funcToRun.runAtMillis;
-        funcToRun.funcToCall();
-        if (funcToRun.recurring) {
-          this.scheduleFunction(funcToRun.timeoutKey,
-              funcToRun.funcToCall,
-              funcToRun.millis,
-              true);
-        }
-      } catch(e) {
-      }
-    }
-    this.runFunctionsWithinRange(oldMillis, nowMillis);
-  }
-};
-
-jasmine.FakeTimer.prototype.scheduleFunction = function(timeoutKey, funcToCall, millis, recurring) {
-  this.scheduledFunctions[timeoutKey] = {
-    runAtMillis: this.nowMillis + millis,
-    funcToCall: funcToCall,
-    recurring: recurring,
-    timeoutKey: timeoutKey,
-    millis: millis
-  };
-};
-
-/**
- * @namespace
- */
-jasmine.Clock = {
-  defaultFakeTimer: new jasmine.FakeTimer(),
-
-  reset: function() {
-    jasmine.Clock.assertInstalled();
-    jasmine.Clock.defaultFakeTimer.reset();
-  },
-
-  tick: function(millis) {
-    jasmine.Clock.assertInstalled();
-    jasmine.Clock.defaultFakeTimer.tick(millis);
-  },
-
-  runFunctionsWithinRange: function(oldMillis, nowMillis) {
-    jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis);
-  },
-
-  scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) {
-    jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring);
-  },
-
-  useMock: function() {
-    if (!jasmine.Clock.isInstalled()) {
-      var spec = jasmine.getEnv().currentSpec;
-      spec.after(jasmine.Clock.uninstallMock);
-
-      jasmine.Clock.installMock();
-    }
-  },
-
-  installMock: function() {
-    jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer;
-  },
-
-  uninstallMock: function() {
-    jasmine.Clock.assertInstalled();
-    jasmine.Clock.installed = jasmine.Clock.real;
-  },
-
-  real: {
-    setTimeout: jasmine.getGlobal().setTimeout,
-    clearTimeout: jasmine.getGlobal().clearTimeout,
-    setInterval: jasmine.getGlobal().setInterval,
-    clearInterval: jasmine.getGlobal().clearInterval
-  },
-
-  assertInstalled: function() {
-    if (!jasmine.Clock.isInstalled()) {
-      throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()");
-    }
-  },
-
-  isInstalled: function() {
-    return jasmine.Clock.installed == jasmine.Clock.defaultFakeTimer;
-  },
-
-  installed: null
-};
-jasmine.Clock.installed = jasmine.Clock.real;
-
-//else for IE support
-jasmine.getGlobal().setTimeout = function(funcToCall, millis) {
-  if (jasmine.Clock.installed.setTimeout.apply) {
-    return jasmine.Clock.installed.setTimeout.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.setTimeout(funcToCall, millis);
-  }
-};
-
-jasmine.getGlobal().setInterval = function(funcToCall, millis) {
-  if (jasmine.Clock.installed.setInterval.apply) {
-    return jasmine.Clock.installed.setInterval.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.setInterval(funcToCall, millis);
-  }
-};
-
-jasmine.getGlobal().clearTimeout = function(timeoutKey) {
-  if (jasmine.Clock.installed.clearTimeout.apply) {
-    return jasmine.Clock.installed.clearTimeout.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.clearTimeout(timeoutKey);
-  }
-};
-
-jasmine.getGlobal().clearInterval = function(timeoutKey) {
-  if (jasmine.Clock.installed.clearTimeout.apply) {
-    return jasmine.Clock.installed.clearInterval.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.clearInterval(timeoutKey);
-  }
-};
 
 jasmine.version_= {
   "major": 1,
-  "minor": 1,
+  "minor": 2,
   "build": 0,
-  "revision": 1330200206
+  "revision": 1337005947
 };

data/vendor/jquery/VERSION

@@ -1 +1 @@
-1.7.0
+1.8.2