Browse Source

Made project name in header static

css_transitions
josdejong 11 years ago
parent
commit
09797fac43
5 changed files with 15 additions and 17 deletions
  1. +2
    -4
      Jakefile.js
  2. +1
    -1
      src/header.js
  3. +4
    -4
      src/timestep.js
  4. +7
    -7
      vis.js
  5. +1
    -1
      vis.min.js

+ 2
- 4
Jakefile.js View File

@ -26,7 +26,7 @@ task('default', ['build', 'minify'], function () {
*/ */
desc('Build the visualization library vis.js'); desc('Build the visualization library vis.js');
task('build', {async: true}, function () { task('build', {async: true}, function () {
// concatenate and stringify css files
// concatenate and stringify the css files
var result = concat({ var result = concat({
src: [ src: [
'./src/component/css/panel.css', './src/component/css/panel.css',
@ -72,8 +72,7 @@ task('build', {async: true}, function () {
'util.loadCss(' + cssText + ');\n' '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(); var b = browserify();
b.add(VIS_TMP); b.add(VIS_TMP);
b.bundle({ b.bundle({
@ -121,7 +120,6 @@ task('minify', function () {
var replacePlaceholders = function (filename) { var replacePlaceholders = function (filename) {
replace({ replace({
replacements: [ replacements: [
{pattern: '@@name', replacement: 'vis.js'},
{pattern: '@@date', replacement: today()}, {pattern: '@@date', replacement: today()},
{pattern: '@@version', replacement: version()} {pattern: '@@version', replacement: version()}
], ],

+ 1
- 1
src/header.js View File

@ -1,5 +1,5 @@
/** /**
* @@name
* vis.js
* https://github.com/almende/vis * https://github.com/almende/vis
* *
* A dynamic, browser-based visualization library. * A dynamic, browser-based visualization library.

+ 4
- 4
src/timestep.js View File

@ -57,8 +57,8 @@ TimeStep.SCALE = {
* to the minimumStep but larger than minimumStep. If minimumStep is not * to the minimumStep but larger than minimumStep. If minimumStep is not
* provided, the scale is set to 1 DAY. * provided, the scale is set to 1 DAY.
* The minimumStep should correspond with the onscreen size of about 6 characters * 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 * @param {int} [minimumStep] Optional. Minimum step size in milliseconds
*/ */
TimeStep.prototype.setRange = function(start, end, minimumStep) { 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 * 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) { TimeStep.prototype.setMinimumStep = function(minimumStep) {
if (minimumStep == undefined) { 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 * date and the scale. For example when scale is MINUTE, the major scale is
* hours, and the hour will be formatted as "hh". * hours, and the hour will be formatted as "hh".
* @param {Date} [date] custom date. if not provided, current date is taken * @param {Date} [date] custom date. if not provided, current date is taken

+ 7
- 7
vis.js View File

@ -5,7 +5,7 @@
* A dynamic, browser-based visualization library. * A dynamic, browser-based visualization library.
* *
* @version 0.0.7 * @version 0.0.7
* @date 2013-04-26
* @date 2013-05-01
* *
* @license * @license
* Copyright (C) 2011-2013 Almende B.V, http://almende.com * 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; (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<n.length;s++)i(n[s]);return i})({1:[function(require,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<n.length;s++)i(n[s]);return i})({1:[function(require,module,exports){
/** /**
* vis.js library imports
* vis.js module imports
*/ */
var moment = require('moment'); var moment = require('moment');
@ -1011,8 +1011,8 @@ TimeStep.SCALE = {
* to the minimumStep but larger than minimumStep. If minimumStep is not * to the minimumStep but larger than minimumStep. If minimumStep is not
* provided, the scale is set to 1 DAY. * provided, the scale is set to 1 DAY.
* The minimumStep should correspond with the onscreen size of about 6 characters * 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 * @param {int} [minimumStep] Optional. Minimum step size in milliseconds
*/ */
TimeStep.prototype.setRange = function(start, end, minimumStep) { TimeStep.prototype.setRange = function(start, end, minimumStep) {
@ -1188,7 +1188,7 @@ TimeStep.prototype.setAutoScale = function (enable) {
/** /**
* Automatically determine the scale that bests fits the provided minimum step * 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) { TimeStep.prototype.setMinimumStep = function(minimumStep) {
if (minimumStep == undefined) { if (minimumStep == undefined) {
@ -1379,7 +1379,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 * date and the scale. For example when scale is MINUTE, the major scale is
* hours, and the hour will be formatted as "hh". * hours, and the hour will be formatted as "hh".
* @param {Date} [date] custom date. if not provided, current date is taken * @param {Date} [date] custom date. if not provided, current date is taken
@ -5101,7 +5101,7 @@ Timeline.prototype.setData = function(data) {
}; };
/** /**
* vis.js library exports
* vis.js module exports
*/ */
var vis = { var vis = {
util: util, util: util,

+ 1
- 1
vis.min.js View File

@ -5,7 +5,7 @@
* A dynamic, browser-based visualization library. * A dynamic, browser-based visualization library.
* *
* @version 0.0.7 * @version 0.0.7
* @date 2013-04-26
* @date 2013-05-01
* *
* @license * @license
* Copyright (C) 2011-2013 Almende B.V, http://almende.com * Copyright (C) 2011-2013 Almende B.V, http://almende.com

Loading…
Cancel
Save