Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: adscott/jasmine-underscore
base: 5ff61cbad2
...
head fork: adscott/jasmine-underscore
compare: 4a0d590e5e
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
View
1  .gitignore
@@ -0,0 +1 @@
+.DS_Store
View
20 lib/external/jasmine-1.1.0/MIT.LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2008-2011 Pivotal Labs
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
2  lib/external/jasmine-html.js → lib/external/jasmine-1.1.0/jasmine-html.js 100755 → 100644
@@ -34,7 +34,7 @@ jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) {
this.outerDiv = this.createDom('div', { className: 'jasmine_reporter' },
this.createDom('div', { className: 'banner' },
this.createDom('div', { className: 'logo' },
- this.createDom('a', { href: 'http://pivotal.github.com/jasmine/', target: "_blank" }, "Jasmine"),
+ this.createDom('span', { className: 'title' }, "Jasmine"),
this.createDom('span', { className: 'version' }, runner.env.versionString())),
this.createDom('div', { className: 'options' },
"Show ",
View
0  lib/external/jasmine.css → lib/external/jasmine-1.1.0/jasmine.css 100755 → 100644
File renamed without changes
View
27 lib/external/jasmine.js → lib/external/jasmine-1.1.0/jasmine.js 100755 → 100644
@@ -735,17 +735,17 @@ jasmine.Env.prototype.version = function () {
* @returns string containing jasmine version build info, if set.
*/
jasmine.Env.prototype.versionString = function() {
- if (jasmine.version_) {
- var version = this.version();
- var versionString = version.major + "." + version.minor + "." + version.build;
- if (version.release_candidate) {
- versionString += ".rc" + version.release_candidate
- }
- versionString += " revision " + version.revision
- return versionString;
- } else {
+ if (!jasmine.version_) {
return "version unknown";
}
+
+ var version = this.version();
+ var versionString = version.major + "." + version.minor + "." + version.build;
+ if (version.release_candidate) {
+ versionString += ".rc" + version.release_candidate;
+ }
+ versionString += " revision " + version.revision;
+ return versionString;
};
/**
@@ -2468,12 +2468,9 @@ jasmine.getGlobal().clearInterval = function(timeoutKey) {
}
};
-
jasmine.version_= {
- "major": 2,
- "minor": 0,
+ "major": 1,
+ "minor": 1,
"build": 0,
- "revision": 1307766763,
- "release_candidate": 1
+ "revision": 1315677058
};
-
View
BIN  lib/external/jasmine-1.1.0/jasmine_favicon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
7 spec-runner.html
@@ -3,12 +3,11 @@
<html>
<head>
<title>Jasmine Test Runner</title>
- <link rel="stylesheet" type="text/css" href="lib/external/jasmine.css"></link>
- <script type="text/javascript" src="lib/external/jasmine.js"></script>
- <script type="text/javascript" src="lib/external/jasmine-html.js"></script>
+ <link rel="stylesheet" type="text/css" href="lib/external/jasmine-1.1.0/jasmine.css"></link>
+ <script type="text/javascript" src="lib/external/jasmine-1.1.0/jasmine.js"></script>
+ <script type="text/javascript" src="lib/external/jasmine-1.1.0/jasmine-html.js"></script>
<script type="text/javascript" src="lib/external/underscore.js"></script>
- <!-- include source files here... -->
<script type="text/javascript" src="lib/jasmine-underscore.js"></script>
<script type="text/javascript" src="spec/jasmine-underscore-spec.js"></script>

No commit comments for this range

Something went wrong with that request. Please try again.