From 09797fac4304e325eba51fd7eee30cedb539e26f Mon Sep 17 00:00:00 2001 From: josdejong Date: Wed, 1 May 2013 13:06:56 +0200 Subject: [PATCH] Made project name in header static --- Jakefile.js | 6 ++---- src/header.js | 2 +- src/timestep.js | 8 ++++---- vis.js | 14 +++++++------- vis.min.js | 2 +- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Jakefile.js b/Jakefile.js index b881b9ac..d86925c0 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -26,7 +26,7 @@ task('default', ['build', 'minify'], function () { */ desc('Build the visualization library vis.js'); task('build', {async: true}, function () { - // concatenate and stringify css files + // concatenate and stringify the css files var result = concat({ src: [ './src/component/css/panel.css', @@ -72,8 +72,7 @@ task('build', {async: true}, function () { 'util.loadCss(' + cssText + ');\n' }); - // bundle the script files - // TODO: do not package moment.js with vis.js. + // bundle the concatenated script and dependencies into one file var b = browserify(); b.add(VIS_TMP); b.bundle({ @@ -121,7 +120,6 @@ task('minify', function () { var replacePlaceholders = function (filename) { replace({ replacements: [ - {pattern: '@@name', replacement: 'vis.js'}, {pattern: '@@date', replacement: today()}, {pattern: '@@version', replacement: version()} ], diff --git a/src/header.js b/src/header.js index 37b5a90c..d5fb94b6 100644 --- a/src/header.js +++ b/src/header.js @@ -1,5 +1,5 @@ /** - * @@name + * vis.js * https://github.com/almende/vis * * A dynamic, browser-based visualization library. diff --git a/src/timestep.js b/src/timestep.js index 4360a9c7..4823b9f7 100644 --- a/src/timestep.js +++ b/src/timestep.js @@ -57,8 +57,8 @@ TimeStep.SCALE = { * to the minimumStep but larger than minimumStep. If minimumStep is not * provided, the scale is set to 1 DAY. * The minimumStep should correspond with the onscreen size of about 6 characters - * @param {Date} start The start date and time. - * @param {Date} end The end date and time. + * @param {Date} [start] The start date and time. + * @param {Date} [end] The end date and time. * @param {int} [minimumStep] Optional. Minimum step size in milliseconds */ TimeStep.prototype.setRange = function(start, end, minimumStep) { @@ -234,7 +234,7 @@ TimeStep.prototype.setAutoScale = function (enable) { /** * Automatically determine the scale that bests fits the provided minimum step - * @param {Number} minimumStep The minimum step size in milliseconds + * @param {Number} [minimumStep] The minimum step size in milliseconds */ TimeStep.prototype.setMinimumStep = function(minimumStep) { if (minimumStep == undefined) { @@ -425,7 +425,7 @@ TimeStep.prototype.getLabelMinor = function(date) { /** - * Returns formatted text for the major axislabel, depending on the current + * Returns formatted text for the major axis label, depending on the current * date and the scale. For example when scale is MINUTE, the major scale is * hours, and the hour will be formatted as "hh". * @param {Date} [date] custom date. if not provided, current date is taken diff --git a/vis.js b/vis.js index 364c06a8..fbf76928 100644 --- a/vis.js +++ b/vis.js @@ -5,7 +5,7 @@ * A dynamic, browser-based visualization library. * * @version 0.0.7 - * @date 2013-04-26 + * @date 2013-05-01 * * @license * Copyright (C) 2011-2013 Almende B.V, http://almende.com @@ -25,7 +25,7 @@ (function(e){if("function"==typeof bootstrap)bootstrap("vis",e);else if("object"==typeof exports)module.exports=e();else if("function"==typeof define&&define.amd)define(e);else if("undefined"!=typeof ses){if(!ses.ok())return;ses.makeVis=e}else"undefined"!=typeof window?window.vis=e():global.vis=e()})(function(){var define,ses,bootstrap,module,exports; return (function(e,t,n){function i(n,s){if(!t[n]){if(!e[n]){var o=typeof require=="function"&&require;if(!s&&o)return o(n,!0);if(r)return r(n,!0);throw new Error("Cannot find module '"+n+"'")}var u=t[n]={exports:{}};e[n][0].call(u.exports,function(t){var r=e[n][1][t];return i(r?r:t)},u,u.exports)}return t[n].exports}var r=typeof require=="function"&&require;for(var s=0;s