Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into release-0.3

  • Loading branch information...
commit 68b19028c1f9d916d58ec23b086a66dc4a578411 2 parents 1d6b355 + b9c32b4
@iros iros authored
Showing with 19 additions and 18 deletions.
  1. +2 −2 grunt.js
  2. +4 −4 src/constructor.js
  3. +13 −12 test/index.html
View
4 grunt.js
@@ -35,7 +35,6 @@ module.exports = function(grunt) {
"src/sync.js",
"src/builder.js",
"src/product.js",
- "src/derived.js",
"src/importer.js",
"src/importers/local.js",
"src/importers/remote.js",
@@ -45,7 +44,8 @@ module.exports = function(grunt) {
"src/parsers/strict.js",
"src/parsers/object.js",
"src/parsers/google_spreadsheet.js",
- "src/parsers/delimited.js"
+ "src/parsers/delimited.js",
+ "src/derived.js"
]
},
View
8 src/constructor.js
@@ -33,15 +33,15 @@
*/
global.Miso = global.Miso || {};
global.Miso.Dataset = function(options) {
+
+ options = options || {};
+
this.length = 0;
this._columns = [];
this._columnPositionByName = {};
this._computedColumns = [];
- if (typeof options !== "undefined") {
- options = options || {};
- this._initialize(options);
- }
+ this._initialize(options);
};
}(this));
View
25 test/index.html
@@ -27,7 +27,6 @@
<script src="../src/view.js"></script>
<script src="../src/product.js"></script>
<script src="../src/dataset.js"></script>
- <script src="../src/derived.js"></script>
<script src="../src/importer.js"></script>
<script src="../src/importers/local.js"></script>
<script src="../src/importers/remote.js"></script>
@@ -38,6 +37,7 @@
<script src="../src/parsers/object.js"></script>
<script src="../src/parsers/google_spreadsheet.js"></script>
<script src="../src/parsers/delimited.js"></script>
+ <script src="../src/derived.js"></script>
<!-- Load data sets -->
<script src="data/short_obj.js"></script>
@@ -54,17 +54,6 @@
<script src="unit/helpers.js"></script>
- <!-- load test modules -->
- <script src="unit/events.js"></script>
- <script src="unit/types.js"></script>
- <script src="unit/core.js"></script>
- <script src="unit/dataset.js"></script>
- <script src="unit/views.js"></script>
- <script src="unit/importers.js"></script>
- <script src="unit/products.js"></script>
- <script src="unit/speed.js"></script>
- <script src="unit/derived.js"></script>
- <script src="unit/bugs.js"></script>
</head>
<body>
@@ -77,5 +66,17 @@ <h2 id="qunit-userAgent"></h2>
<br />
<h1 class="qunit-header">Speed Suite</h1>
</div>
+
+ <!-- load test modules -->
+ <script src="unit/events.js"></script>
+ <script src="unit/types.js"></script>
+ <script src="unit/core.js"></script>
+ <script src="unit/dataset.js"></script>
+ <script src="unit/views.js"></script>
+ <script src="unit/importers.js"></script>
+ <script src="unit/products.js"></script>
+ <script src="unit/speed.js"></script>
+ <script src="unit/derived.js"></script>
+ <script src="unit/bugs.js"></script>
</body>
</html>
Please sign in to comment.
Something went wrong with that request. Please try again.