From 2a04791d30dd1a33c52d221a681ce14185f9c372 Mon Sep 17 00:00:00 2001 From: David Schoonover Date: Tue, 17 Jul 2012 14:12:55 -0700 Subject: [PATCH] Makes all imports relative. --- .gitignore | 6 ++-- .npmignore | 4 +- Cokefile | 13 +++++------ lib/app.js | 2 +- lib/base/asset-manager.js | 4 +- lib/base/base-mixin.js | 2 +- lib/base/base-mixin.mod.js | 2 +- lib/base/base-model.js | 4 +- lib/base/base-model.mod.js | 4 +- lib/base/base-view.js | 10 ++++---- lib/base/base-view.mod.js | 10 ++++---- lib/base/base.js | 2 +- lib/base/base.mod.js | 2 +- lib/base/cascading-model.js | 6 ++-- lib/base/cascading-model.mod.js | 6 ++-- lib/base/data-binding.js | 2 +- lib/base/data-binding.mod.js | 2 +- lib/base/index.js | 14 ++++++------ lib/base/index.mod.js | 16 +++++++------- lib/base/model-cache.js | 2 +- lib/base/model-cache.mod.js | 2 +- lib/base/resource-router.js | 4 +- lib/base/scaffold/index.js | 4 +- lib/base/scaffold/index.mod.js | 6 ++-- lib/base/scaffold/scaffold-model.js | 7 ++--- lib/base/scaffold/scaffold-model.mod.js | 7 ++--- lib/base/scaffold/scaffold-view.js | 9 +++---- lib/base/scaffold/scaffold-view.mod.js | 9 +++---- lib/chart/chart-type.js | 6 ++-- lib/chart/chart-type.mod.js | 6 ++-- lib/chart/index.js | 10 ++++---- lib/chart/index.mod.js | 12 +++++----- lib/chart/option/chart-option-model.js | 6 ++-- lib/chart/option/chart-option-model.mod.js | 6 ++-- lib/chart/option/chart-option-view.js | 10 ++++---- lib/chart/option/chart-option-view.mod.js | 10 ++++---- lib/chart/option/index.js | 4 +- lib/chart/option/index.mod.js | 6 ++-- lib/chart/type/d3-chart.js | 6 ++-- lib/chart/type/d3-chart.mod.js | 6 ++-- lib/chart/type/d3/d3-bar-chart-type.js | 4 +- lib/chart/type/d3/d3-bar-element.js | 6 ++-- lib/chart/type/d3/d3-bar-element.mod.js | 6 ++-- lib/chart/type/d3/d3-chart-element.js | 4 +- lib/chart/type/d3/d3-chart-element.mod.js | 4 +- lib/chart/type/d3/d3-geo-element.js | 4 +- lib/chart/type/d3/d3-line-element.js | 6 ++-- lib/chart/type/d3/d3-line-element.mod.js | 6 ++-- lib/chart/type/d3/index.js | 6 ++-- lib/chart/type/d3/index.mod.js | 8 +++--- lib/chart/type/dygraphs.js | 4 +- lib/chart/type/dygraphs.mod.js | 4 +- lib/chart/type/index.mod.js | 2 +- lib/dashboard/dashboard-model.js | 6 ++-- lib/dashboard/dashboard-model.mod.js | 6 ++-- lib/dashboard/dashboard-view.js | 12 +++++----- lib/dashboard/dashboard-view.mod.js | 12 +++++----- lib/dashboard/index.js | 4 +- lib/dashboard/index.mod.js | 6 ++-- lib/data/data-view.js | 12 +++++----- lib/data/data-view.mod.js | 12 +++++----- lib/data/dataset-model.js | 8 +++--- lib/data/dataset-model.mod.js | 8 +++--- lib/data/dataset-view.js | 8 +++--- lib/data/dataset-view.mod.js | 8 +++--- lib/data/datasource-model.js | 8 +++--- lib/data/datasource-model.mod.js | 8 +++--- lib/data/datasource-ui-view.js | 6 ++-- lib/data/datasource-ui-view.mod.js | 6 ++-- lib/data/datasource-view.js | 6 ++-- lib/data/datasource-view.mod.js | 6 ++-- lib/data/index.js | 16 +++++++------- lib/data/index.mod.js | 18 ++++++++-------- lib/data/metric-edit-view.js | 10 ++++---- lib/data/metric-edit-view.mod.js | 10 ++++---- lib/data/metric-model.js | 8 +++--- lib/data/metric-model.mod.js | 8 +++--- lib/graph/graph-display-view.js | 8 +++--- lib/graph/graph-display-view.mod.js | 8 +++--- lib/graph/graph-edit-view.js | 12 +++++----- lib/graph/graph-edit-view.mod.js | 12 +++++----- lib/graph/graph-list-view.js | 8 +++--- lib/graph/graph-list-view.mod.js | 8 +++--- lib/graph/graph-model.js | 8 +++--- lib/graph/graph-model.mod.js | 8 +++--- lib/graph/graph-view.js | 6 ++-- lib/graph/graph-view.mod.js | 6 ++-- lib/graph/index.js | 10 ++++---- lib/graph/index.mod.js | 12 +++++----- lib/index.js | 1 + lib/limn.js | 10 ++++---- lib/limn.mod.js | 10 ++++---- lib/server/files.js | 2 +- lib/server/middleware.js | 13 ++++------- lib/server/server.js | 4 +++ lib/server/view-helpers.js | 15 +++++++------ lib/util/aliasdict.js | 2 +- lib/util/cascade.js | 2 +- lib/util/cascade.mod.js | 2 +- lib/util/event/index.js | 4 +- lib/util/event/index.mod.js | 6 ++-- lib/util/event/ready-emitter.js | 2 +- lib/util/event/ready-emitter.mod.js | 2 +- lib/util/event/waiting-emitter.js | 2 +- lib/util/event/waiting-emitter.mod.js | 2 +- lib/util/formatters.js | 2 +- lib/util/formatters.mod.js | 2 +- lib/util/index.js | 12 +++++----- lib/util/index.mod.js | 14 ++++++------ lib/util/op.js | 30 ++++++++++++++++----------- lib/util/op.mod.js | 28 +++++++++++++++---------- lib/util/parser.js | 6 ++-- lib/util/parser.mod.js | 6 ++-- lib/util/timeseries/csv.js | 4 +- lib/util/timeseries/csv.mod.js | 4 +- lib/util/timeseries/index.js | 4 +- lib/util/timeseries/index.mod.js | 6 ++-- lib/util/timeseries/timeseries.js | 2 +- lib/util/timeseries/timeseries.mod.js | 2 +- lib/util/underscore/index.js | 12 +++++----- lib/util/underscore/index.mod.js | 14 ++++++------ package.co | 14 +++++------- package.json | 1 + src/app.co | 2 +- src/base/asset-manager.co | 4 +- src/base/base-mixin.co | 2 +- src/base/base-model.co | 4 +- src/base/base-view.co | 10 ++++---- src/base/base.co | 2 +- src/base/cascading-model.co | 6 ++-- src/base/data-binding.co | 2 +- src/base/index.co | 14 ++++++------ src/base/model-cache.co | 2 +- src/base/resource-router.co | 4 +- src/base/scaffold/index.co | 4 +- src/base/scaffold/scaffold-model.co | 6 ++-- src/base/scaffold/scaffold-view.co | 8 +++--- src/chart/chart-type.co | 6 ++-- src/chart/index.co | 10 ++++---- src/chart/option/chart-option-model.co | 6 ++-- src/chart/option/chart-option-view.co | 10 ++++---- src/chart/option/index.co | 4 +- src/chart/type/d3-chart.co | 6 ++-- src/chart/type/d3/d3-bar-chart-type.co | 4 +- src/chart/type/d3/d3-bar-element.co | 6 ++-- src/chart/type/d3/d3-chart-element.co | 5 +-- src/chart/type/d3/d3-geo-element.co | 4 +- src/chart/type/d3/d3-line-element.co | 6 ++-- src/chart/type/d3/index.co | 8 +++--- src/chart/type/dygraphs.co | 4 +- src/dashboard/dashboard-model.co | 6 ++-- src/dashboard/dashboard-view.co | 12 +++++----- src/dashboard/index.co | 4 +- src/data/data-view.co | 12 +++++----- src/data/dataset-model.co | 8 +++--- src/data/dataset-view.co | 8 +++--- src/data/datasource-model.co | 8 +++--- src/data/datasource-ui-view.co | 6 ++-- src/data/datasource-view.co | 6 ++-- src/data/index.co | 16 +++++++------- src/data/metric-edit-view.co | 10 ++++---- src/data/metric-model.co | 8 +++--- src/graph/graph-display-view.co | 8 +++--- src/graph/graph-edit-view.co | 12 +++++----- src/graph/graph-list-view.co | 8 +++--- src/graph/graph-model.co | 8 +++--- src/graph/graph-view.co | 6 ++-- src/graph/index.co | 10 ++++---- src/index.co | 2 + src/limn.co | 10 ++++---- src/server/files.co | 4 +- src/server/server.co | 2 + src/server/view-helpers.co | 15 +++++++------ src/util/aliasdict.co | 2 +- src/util/cascade.co | 2 +- src/util/event/index.co | 4 +- src/util/event/ready-emitter.co | 2 +- src/util/event/waiting-emitter.co | 2 +- src/util/formatters.co | 2 +- src/util/index.co | 18 ++++++++-------- src/util/op.co | 21 +++++++++++-------- src/util/parser.co | 6 ++-- src/util/timeseries/csv.co | 4 +- src/util/timeseries/index.co | 4 +- src/util/timeseries/timeseries.co | 2 +- src/util/underscore/index.co | 12 +++++----- src/version.js | 2 +- 187 files changed, 655 insertions(+), 639 deletions(-) create mode 100644 lib/index.js create mode 100644 src/index.co diff --git a/.gitignore b/.gitignore index 2488c18..a8854c7 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,8 @@ lib-cov/ test/*.log test/fixtures/*.json test/fixtures/logs/*.log +.cache/ +.tmp/ build dist @@ -32,9 +34,7 @@ var log tmp -lib/version.js +version.js www/presets/*.json -.cache -.tmp diff --git a/.npmignore b/.npmignore index d88161d..6609060 100644 --- a/.npmignore +++ b/.npmignore @@ -17,8 +17,6 @@ pip-log.txt docs/_build/* .env/ -.cache -.tmp npm-debug.log node_modules/ node_modules/* @@ -27,6 +25,8 @@ lib-cov/ test/*.log test/fixtures/*.json test/fixtures/logs/*.log +.cache/ +.tmp/ build dist diff --git a/Cokefile b/Cokefile index 876cf99..c19c035 100644 --- a/Cokefile +++ b/Cokefile @@ -30,7 +30,7 @@ task \install 'Install project dependencies.' -> task \setup 'Ensure project is set up for development.' -> invoke \install - invoke \link + # invoke \link err, version <- writeVersionFile 'src/version.js' @@ -44,7 +44,7 @@ task \build 'Build coco sources' -> invoke \setup coco <[ -bjc package.co ]> - {sources} = require 'limn/server/view-helpers' + {sources} = require './src/server/view-helpers' browserify = require 'browserify' Coco = require 'coco' Jade = require 'jade' @@ -99,7 +99,7 @@ task \build 'Build coco sources' -> return @ok() return @ok() if _.startsWith(srcfile, 'vendor') and exists outfile parts = srcfile.replace fullExt, '' .split '/' .slice 1 - parts.pop() if 'index' is _.last parts + # parts.pop() if 'index' is _.last parts ID = parts.join '/' console.log " Wrapping JS in Module:\t #infile \t-->\t #outfile" mkdirp dirname outfile @@ -140,7 +140,7 @@ task \bundle 'Build application and vendor bundles' -> invoke \bundle_combine task \bundle_app 'Build application bundle' -> - {sources} = require 'limn/server/view-helpers' + {sources} = require './src/server/view-helpers' app_sources = sources("www/modules.yaml", 'development') .filter -> not _.startsWith it, '/vendor' @@ -154,7 +154,7 @@ task \bundle_app 'Build application bundle' -> say 'ok.\n' task \bundle_vendor 'Build vendor bundle' -> - {sources} = require 'limn/server/view-helpers' + {sources} = require './src/server/view-helpers' VENDOR_BUNDLE_PATH = 'var/vendor/vendor-bundle.js' vendor_sources = sources("www/modules.yaml", 'development') @@ -220,8 +220,7 @@ task \clean 'Clean up environment and artifacts' -> task \source_list 'Print a list of the source file paths.' -> - invoke \setup - {sources} = require 'limn/server/view-helpers' + {sources} = require './src/server/view-helpers' say do sources("www/modules.yaml", 'development') .map -> it.slice 1 diff --git a/lib/app.js b/lib/app.js index 4b2153d..4b42779 100644 --- a/lib/app.js +++ b/lib/app.js @@ -1,6 +1,6 @@ var Backbone, op, AppView, _ref, _; Backbone = require('backbone'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('./util'), _ = _ref._, op = _ref.op; /** * @class Application view, automatically attaching to an existing element * found at `appSelector`. diff --git a/lib/base/asset-manager.js b/lib/base/asset-manager.js index 777e183..47c80f6 100644 --- a/lib/base/asset-manager.js +++ b/lib/base/asset-manager.js @@ -1,6 +1,6 @@ var op, ReadyEmitter, AssetManager, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -ReadyEmitter = require('limn/util/event').ReadyEmitter; +_ref = require('../util'), _ = _ref._, op = _ref.op; +ReadyEmitter = require('../util/event').ReadyEmitter; AssetManager = (function(superclass){ AssetManager.displayName = 'AssetManager'; var prototype = __extend(AssetManager, superclass).prototype, constructor = AssetManager; diff --git a/lib/base/base-mixin.js b/lib/base/base-mixin.js index 95e44a0..4acc079 100644 --- a/lib/base/base-mixin.js +++ b/lib/base/base-mixin.js @@ -1,6 +1,6 @@ var Backbone, op, BaseBackboneMixin, Mixin, mixinBase, _ref, _, __slice = [].slice; Backbone = require('backbone'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('../util'), _ = _ref._, op = _ref.op; BaseBackboneMixin = exports.BaseBackboneMixin = { initialize: function(){ return this.__apply_bind__(); diff --git a/lib/base/base-mixin.mod.js b/lib/base/base-mixin.mod.js index c2ad253..03de9b4 100644 --- a/lib/base/base-mixin.mod.js +++ b/lib/base/base-mixin.mod.js @@ -2,7 +2,7 @@ require.define('/node_modules/limn/base/base-mixin.js', function(require, module var Backbone, op, BaseBackboneMixin, Mixin, mixinBase, _ref, _, __slice = [].slice; Backbone = require('backbone'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('../util'), _ = _ref._, op = _ref.op; BaseBackboneMixin = exports.BaseBackboneMixin = { initialize: function(){ return this.__apply_bind__(); diff --git a/lib/base/base-model.js b/lib/base/base-model.js index 2d83a61..2e3394c 100644 --- a/lib/base/base-model.js +++ b/lib/base/base-model.js @@ -1,7 +1,7 @@ var Backbone, op, BaseBackboneMixin, mixinBase, BaseModel, BaseList, _ref, _, __slice = [].slice; Backbone = require('backbone'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base/base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('./base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase; /** * @class Base model, extending Backbone.Model, used by scaffold and others. * @extends Backbone.Model diff --git a/lib/base/base-model.mod.js b/lib/base/base-model.mod.js index 1c2b0c4..9d7f227 100644 --- a/lib/base/base-model.mod.js +++ b/lib/base/base-model.mod.js @@ -2,8 +2,8 @@ require.define('/node_modules/limn/base/base-model.js', function(require, module var Backbone, op, BaseBackboneMixin, mixinBase, BaseModel, BaseList, _ref, _, __slice = [].slice; Backbone = require('backbone'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base/base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('./base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase; /** * @class Base model, extending Backbone.Model, used by scaffold and others. * @extends Backbone.Model diff --git a/lib/base/base-view.js b/lib/base/base-view.js index aac1098..0fdc165 100644 --- a/lib/base/base-view.js +++ b/lib/base/base-view.js @@ -1,9 +1,9 @@ -var Backbone, op, BaseBackboneMixin, mixinBase, BaseModel, DataBinding, BaseView, ViewList, _ref, _, __slice = [].slice; +var Backbone, op, mixinBase, BaseModel, DataBinding, BaseView, ViewList, _ref, _, __slice = [].slice; Backbone = require('backbone'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base/base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase; -BaseModel = require('limn/base/base-mixin').BaseModel; -DataBinding = require('limn/base/data-binding').DataBinding; +_ref = require('../util'), _ = _ref._, op = _ref.op; +mixinBase = require('./base-mixin').mixinBase; +BaseModel = require('./base-model').BaseModel; +DataBinding = require('./data-binding').DataBinding; /** * @class Base view, extending Backbone.View, used by scaffold and others. * @extends Backbone.View diff --git a/lib/base/base-view.mod.js b/lib/base/base-view.mod.js index 7b3e07f..e599e37 100644 --- a/lib/base/base-view.mod.js +++ b/lib/base/base-view.mod.js @@ -1,11 +1,11 @@ require.define('/node_modules/limn/base/base-view.js', function(require, module, exports, __dirname, __filename, undefined){ -var Backbone, op, BaseBackboneMixin, mixinBase, BaseModel, DataBinding, BaseView, ViewList, _ref, _, __slice = [].slice; +var Backbone, op, mixinBase, BaseModel, DataBinding, BaseView, ViewList, _ref, _, __slice = [].slice; Backbone = require('backbone'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base/base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase; -BaseModel = require('limn/base/base-mixin').BaseModel; -DataBinding = require('limn/base/data-binding').DataBinding; +_ref = require('../util'), _ = _ref._, op = _ref.op; +mixinBase = require('./base-mixin').mixinBase; +BaseModel = require('./base-model').BaseModel; +DataBinding = require('./data-binding').DataBinding; /** * @class Base view, extending Backbone.View, used by scaffold and others. * @extends Backbone.View diff --git a/lib/base/base.js b/lib/base/base.js index a053582..eac2083 100644 --- a/lib/base/base.js +++ b/lib/base/base.js @@ -2,7 +2,7 @@ var EventEmitter, op, Base, k, _ref, _, _i, _len, __slice = [].slice; EventEmitter = require('events').EventEmitter; EventEmitter.prototype.off = EventEmitter.prototype.removeListener; EventEmitter.prototype.trigger = EventEmitter.prototype.emit; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('../util'), _ = _ref._, op = _ref.op; /** * @class Eventful base class. * @extends EventEmitter diff --git a/lib/base/base.mod.js b/lib/base/base.mod.js index 1be5b75..d8daec5 100644 --- a/lib/base/base.mod.js +++ b/lib/base/base.mod.js @@ -4,7 +4,7 @@ var EventEmitter, op, Base, k, _ref, _, _i, _len, __slice = [].slice; EventEmitter = require('events').EventEmitter; EventEmitter.prototype.off = EventEmitter.prototype.removeListener; EventEmitter.prototype.trigger = EventEmitter.prototype.emit; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('../util'), _ = _ref._, op = _ref.op; /** * @class Eventful base class. * @extends EventEmitter diff --git a/lib/base/cascading-model.js b/lib/base/cascading-model.js index 3fd3f9d..f6c10bd 100644 --- a/lib/base/cascading-model.js +++ b/lib/base/cascading-model.js @@ -1,7 +1,7 @@ var op, BaseModel, BaseList, Cascade, CascadingModel, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base/base-model'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; -Cascade = require('limn/util/cascade'); +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('./base-model'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +Cascade = require('../util/cascade'); /** * @class A model that implements cascading lookups for its attributes. */ diff --git a/lib/base/cascading-model.mod.js b/lib/base/cascading-model.mod.js index 5a19a6d..2ddc3c8 100644 --- a/lib/base/cascading-model.mod.js +++ b/lib/base/cascading-model.mod.js @@ -1,9 +1,9 @@ require.define('/node_modules/limn/base/cascading-model.js', function(require, module, exports, __dirname, __filename, undefined){ var op, BaseModel, BaseList, Cascade, CascadingModel, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base/base-model'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; -Cascade = require('limn/util/cascade'); +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('./base-model'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +Cascade = require('../util/cascade'); /** * @class A model that implements cascading lookups for its attributes. */ diff --git a/lib/base/data-binding.js b/lib/base/data-binding.js index 8ddc4a3..3964b9d 100644 --- a/lib/base/data-binding.js +++ b/lib/base/data-binding.js @@ -1,6 +1,6 @@ var Backbone, op, DataBinding, _ref, _; Backbone = require('backbone'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('../util'), _ = _ref._, op = _ref.op; exports.DataBinding = DataBinding = (function(){ DataBinding.displayName = 'DataBinding'; var prototype = DataBinding.prototype, constructor = DataBinding; diff --git a/lib/base/data-binding.mod.js b/lib/base/data-binding.mod.js index f6c0475..336e9b3 100644 --- a/lib/base/data-binding.mod.js +++ b/lib/base/data-binding.mod.js @@ -2,7 +2,7 @@ require.define('/node_modules/limn/base/data-binding.js', function(require, modu var Backbone, op, DataBinding, _ref, _; Backbone = require('backbone'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('../util'), _ = _ref._, op = _ref.op; exports.DataBinding = DataBinding = (function(){ DataBinding.displayName = 'DataBinding'; var prototype = DataBinding.prototype, constructor = DataBinding; diff --git a/lib/base/index.js b/lib/base/index.js index 62833c4..5caef36 100644 --- a/lib/base/index.js +++ b/lib/base/index.js @@ -1,11 +1,11 @@ var mixins, models, views, cache, cascading, data_binding; -exports.Base = require('limn/base/base'); -mixins = require('limn/base/base-mixin'); -models = require('limn/base/base-model'); -views = require('limn/base/base-view'); -cache = require('limn/base/model-cache'); -cascading = require('limn/base/cascading-model'); -data_binding = require('limn/base/data-binding'); +exports.Base = require('./base'); +mixins = require('./base-mixin'); +models = require('./base-model'); +views = require('./base-view'); +cache = require('./model-cache'); +cascading = require('./cascading-model'); +data_binding = require('./data-binding'); __import(__import(__import(__import(__import(__import(exports, mixins), models), views), cache), cascading), data_binding); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/base/index.mod.js b/lib/base/index.mod.js index 8e7fb07..d23b254 100644 --- a/lib/base/index.mod.js +++ b/lib/base/index.mod.js @@ -1,13 +1,13 @@ -require.define('/node_modules/limn/base.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/base/index.js', function(require, module, exports, __dirname, __filename, undefined){ var mixins, models, views, cache, cascading, data_binding; -exports.Base = require('limn/base/base'); -mixins = require('limn/base/base-mixin'); -models = require('limn/base/base-model'); -views = require('limn/base/base-view'); -cache = require('limn/base/model-cache'); -cascading = require('limn/base/cascading-model'); -data_binding = require('limn/base/data-binding'); +exports.Base = require('./base'); +mixins = require('./base-mixin'); +models = require('./base-model'); +views = require('./base-view'); +cache = require('./model-cache'); +cascading = require('./cascading-model'); +data_binding = require('./data-binding'); __import(__import(__import(__import(__import(__import(exports, mixins), models), views), cache), cascading), data_binding); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/base/model-cache.js b/lib/base/model-cache.js index e951ad1..bdfbb1e 100644 --- a/lib/base/model-cache.js +++ b/lib/base/model-cache.js @@ -1,7 +1,7 @@ var Seq, ReadyEmitter, ModelCache, _; _ = require('underscore'); Seq = require('seq'); -ReadyEmitter = require('limn/util/event').ReadyEmitter; +ReadyEmitter = require('../util/event').ReadyEmitter; /** * @class Caches models and provides static lookups by ID. */ diff --git a/lib/base/model-cache.mod.js b/lib/base/model-cache.mod.js index 32dae37..c9a7b3d 100644 --- a/lib/base/model-cache.mod.js +++ b/lib/base/model-cache.mod.js @@ -3,7 +3,7 @@ require.define('/node_modules/limn/base/model-cache.js', function(require, modul var Seq, ReadyEmitter, ModelCache, _; _ = require('underscore'); Seq = require('seq'); -ReadyEmitter = require('limn/util/event').ReadyEmitter; +ReadyEmitter = require('../util/event').ReadyEmitter; /** * @class Caches models and provides static lookups by ID. */ diff --git a/lib/base/resource-router.js b/lib/base/resource-router.js index fd3aa97..335ecae 100644 --- a/lib/base/resource-router.js +++ b/lib/base/resource-router.js @@ -1,7 +1,7 @@ var Backbone, op, BaseBackboneMixin, mixinBase, ResourceRouter, _ref, _; Backbone = require('backbone'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base/base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('./base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase; ResourceRouter = exports.ResourceRouter = Backbone.Router.extend(mixinBase({ __bind__: [] /** diff --git a/lib/base/scaffold/index.js b/lib/base/scaffold/index.js index fecf1b8..7e73c1e 100644 --- a/lib/base/scaffold/index.js +++ b/lib/base/scaffold/index.js @@ -1,6 +1,6 @@ var models, views; -models = require('limn/base/scaffold/scaffold-model'); -views = require('limn/base/scaffold/scaffold-view'); +models = require('./scaffold-model'); +views = require('./scaffold-view'); __import(__import(exports, models), views); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/base/scaffold/index.mod.js b/lib/base/scaffold/index.mod.js index 9ec5c5e..fb3c147 100644 --- a/lib/base/scaffold/index.mod.js +++ b/lib/base/scaffold/index.mod.js @@ -1,8 +1,8 @@ -require.define('/node_modules/limn/base/scaffold.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/base/scaffold/index.js', function(require, module, exports, __dirname, __filename, undefined){ var models, views; -models = require('limn/base/scaffold/scaffold-model'); -views = require('limn/base/scaffold/scaffold-view'); +models = require('./scaffold-model'); +views = require('./scaffold-view'); __import(__import(exports, models), views); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/base/scaffold/scaffold-model.js b/lib/base/scaffold/scaffold-model.js index 311b975..bf89662 100644 --- a/lib/base/scaffold/scaffold-model.js +++ b/lib/base/scaffold/scaffold-model.js @@ -1,7 +1,6 @@ -var op, BaseModel, BaseList, Field, FieldList, _, _ref, __slice = [].slice; -_ = require('limn/util/underscore'); -op = require('limn/util/op'); -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +var op, BaseModel, BaseList, Field, FieldList, _ref, _, __slice = [].slice; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; Field = exports.Field = BaseModel.extend({ valueAttribute: 'value', defaults: function(){ diff --git a/lib/base/scaffold/scaffold-model.mod.js b/lib/base/scaffold/scaffold-model.mod.js index a0b4836..fa788fc 100644 --- a/lib/base/scaffold/scaffold-model.mod.js +++ b/lib/base/scaffold/scaffold-model.mod.js @@ -1,9 +1,8 @@ require.define('/node_modules/limn/base/scaffold/scaffold-model.js', function(require, module, exports, __dirname, __filename, undefined){ -var op, BaseModel, BaseList, Field, FieldList, _, _ref, __slice = [].slice; -_ = require('limn/util/underscore'); -op = require('limn/util/op'); -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +var op, BaseModel, BaseList, Field, FieldList, _ref, _, __slice = [].slice; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; Field = exports.Field = BaseModel.extend({ valueAttribute: 'value', defaults: function(){ diff --git a/lib/base/scaffold/scaffold-view.js b/lib/base/scaffold/scaffold-view.js index ee47968..520d8c6 100644 --- a/lib/base/scaffold/scaffold-view.js +++ b/lib/base/scaffold/scaffold-view.js @@ -1,8 +1,7 @@ -var op, BaseView, Field, FieldList, FieldView, Scaffold, _, _ref; -_ = require('limn/util/underscore'); -op = require('limn/util/op'); -BaseView = require('limn/base').BaseView; -_ref = require('limn/base/scaffold/scaffold-model'), Field = _ref.Field, FieldList = _ref.FieldList; +var op, BaseView, Field, FieldList, FieldView, Scaffold, _ref, _; +_ref = require('../../util'), _ = _ref._, op = _ref.op; +BaseView = require('../../base').BaseView; +_ref = require('./scaffold-model'), Field = _ref.Field, FieldList = _ref.FieldList; FieldView = exports.FieldView = BaseView.extend({ tagName: 'div', className: 'field', diff --git a/lib/base/scaffold/scaffold-view.mod.js b/lib/base/scaffold/scaffold-view.mod.js index 070156e..17a7ca8 100644 --- a/lib/base/scaffold/scaffold-view.mod.js +++ b/lib/base/scaffold/scaffold-view.mod.js @@ -1,10 +1,9 @@ require.define('/node_modules/limn/base/scaffold/scaffold-view.js', function(require, module, exports, __dirname, __filename, undefined){ -var op, BaseView, Field, FieldList, FieldView, Scaffold, _, _ref; -_ = require('limn/util/underscore'); -op = require('limn/util/op'); -BaseView = require('limn/base').BaseView; -_ref = require('limn/base/scaffold/scaffold-model'), Field = _ref.Field, FieldList = _ref.FieldList; +var op, BaseView, Field, FieldList, FieldView, Scaffold, _ref, _; +_ref = require('../../util'), _ = _ref._, op = _ref.op; +BaseView = require('../../base').BaseView; +_ref = require('./scaffold-model'), Field = _ref.Field, FieldList = _ref.FieldList; FieldView = exports.FieldView = BaseView.extend({ tagName: 'div', className: 'field', diff --git a/lib/chart/chart-type.js b/lib/chart/chart-type.js index b6e1e0b..721046d 100644 --- a/lib/chart/chart-type.js +++ b/lib/chart/chart-type.js @@ -1,9 +1,9 @@ var moment, Backbone, op, ReadyEmitter, Parsers, ParserMixin, KNOWN_CHART_TYPES, ChartType, _ref, _, __slice = [].slice; moment = require('moment'); Backbone = require('backbone'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -ReadyEmitter = require('limn/util/event').ReadyEmitter; -_ref = require('limn/util/parser'), Parsers = _ref.Parsers, ParserMixin = _ref.ParserMixin; +_ref = require('../util'), _ = _ref._, op = _ref.op; +ReadyEmitter = require('../util/event').ReadyEmitter; +_ref = require('../util/parser'), Parsers = _ref.Parsers, ParserMixin = _ref.ParserMixin; /** * Map of known libraries by name. * @type Object diff --git a/lib/chart/chart-type.mod.js b/lib/chart/chart-type.mod.js index 8fa3fc0..e62af90 100644 --- a/lib/chart/chart-type.mod.js +++ b/lib/chart/chart-type.mod.js @@ -3,9 +3,9 @@ require.define('/node_modules/limn/chart/chart-type.js', function(require, modul var moment, Backbone, op, ReadyEmitter, Parsers, ParserMixin, KNOWN_CHART_TYPES, ChartType, _ref, _, __slice = [].slice; moment = require('moment'); Backbone = require('backbone'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -ReadyEmitter = require('limn/util/event').ReadyEmitter; -_ref = require('limn/util/parser'), Parsers = _ref.Parsers, ParserMixin = _ref.ParserMixin; +_ref = require('../util'), _ = _ref._, op = _ref.op; +ReadyEmitter = require('../util/event').ReadyEmitter; +_ref = require('../util/parser'), Parsers = _ref.Parsers, ParserMixin = _ref.ParserMixin; /** * Map of known libraries by name. * @type Object diff --git a/lib/chart/index.js b/lib/chart/index.js index 21f339f..0837cfc 100644 --- a/lib/chart/index.js +++ b/lib/chart/index.js @@ -1,9 +1,9 @@ var chart_type, chart_option, dygraphs, d3_chart, d3_elements; -chart_type = require('limn/chart/chart-type'); -chart_option = require('limn/chart/option'); -dygraphs = require('limn/chart/type/dygraphs'); -d3_chart = require('limn/chart/type/d3-chart'); -d3_elements = require('limn/chart/type/d3'); +chart_type = require('./chart-type'); +chart_option = require('./option'); +dygraphs = require('./type/dygraphs'); +d3_chart = require('./type/d3-chart'); +d3_elements = require('./type/d3'); __import(__import(__import(__import(__import(exports, chart_type), chart_option), dygraphs), d3_chart), d3_elements); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/chart/index.mod.js b/lib/chart/index.mod.js index 49ce799..3eff1e4 100644 --- a/lib/chart/index.mod.js +++ b/lib/chart/index.mod.js @@ -1,11 +1,11 @@ -require.define('/node_modules/limn/chart.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/chart/index.js', function(require, module, exports, __dirname, __filename, undefined){ var chart_type, chart_option, dygraphs, d3_chart, d3_elements; -chart_type = require('limn/chart/chart-type'); -chart_option = require('limn/chart/option'); -dygraphs = require('limn/chart/type/dygraphs'); -d3_chart = require('limn/chart/type/d3-chart'); -d3_elements = require('limn/chart/type/d3'); +chart_type = require('./chart-type'); +chart_option = require('./option'); +dygraphs = require('./type/dygraphs'); +d3_chart = require('./type/d3-chart'); +d3_elements = require('./type/d3'); __import(__import(__import(__import(__import(exports, chart_type), chart_option), dygraphs), d3_chart), d3_elements); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/chart/option/chart-option-model.js b/lib/chart/option/chart-option-model.js index 91f0180..f066113 100644 --- a/lib/chart/option/chart-option-model.js +++ b/lib/chart/option/chart-option-model.js @@ -1,7 +1,7 @@ var op, Parsers, ParserMixin, ParsingModel, ParsingView, BaseModel, BaseList, TagSet, KNOWN_TAGS, ChartOption, ChartOptionList, _ref, _, __slice = [].slice; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/util/parser'), Parsers = _ref.Parsers, ParserMixin = _ref.ParserMixin, ParsingModel = _ref.ParsingModel, ParsingView = _ref.ParsingView; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +_ref = require('../../util'), _ = _ref._, op = _ref.op; +_ref = require('../../util/parser'), Parsers = _ref.Parsers, ParserMixin = _ref.ParserMixin, ParsingModel = _ref.ParsingModel, ParsingView = _ref.ParsingView; +_ref = require('../../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; /** * @class A set of tags. */ diff --git a/lib/chart/option/chart-option-model.mod.js b/lib/chart/option/chart-option-model.mod.js index 97dde6c..0e5a921 100644 --- a/lib/chart/option/chart-option-model.mod.js +++ b/lib/chart/option/chart-option-model.mod.js @@ -1,9 +1,9 @@ require.define('/node_modules/limn/chart/option/chart-option-model.js', function(require, module, exports, __dirname, __filename, undefined){ var op, Parsers, ParserMixin, ParsingModel, ParsingView, BaseModel, BaseList, TagSet, KNOWN_TAGS, ChartOption, ChartOptionList, _ref, _, __slice = [].slice; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/util/parser'), Parsers = _ref.Parsers, ParserMixin = _ref.ParserMixin, ParsingModel = _ref.ParsingModel, ParsingView = _ref.ParsingView; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +_ref = require('../../util'), _ = _ref._, op = _ref.op; +_ref = require('../../util/parser'), Parsers = _ref.Parsers, ParserMixin = _ref.ParserMixin, ParsingModel = _ref.ParsingModel, ParsingView = _ref.ParsingView; +_ref = require('../../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; /** * @class A set of tags. */ diff --git a/lib/chart/option/chart-option-view.js b/lib/chart/option/chart-option-view.js index 549be0f..6c47056 100644 --- a/lib/chart/option/chart-option-view.js +++ b/lib/chart/option/chart-option-view.js @@ -1,7 +1,7 @@ var op, BaseView, ChartOption, ChartOptionList, DEBOUNCE_RENDER, ChartOptionView, ChartOptionScaffold, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -BaseView = require('limn/base').BaseView; -_ref = require('limn/chart/option/chart-option-model'), ChartOption = _ref.ChartOption, ChartOptionList = _ref.ChartOptionList; +_ref = require('../../util'), _ = _ref._, op = _ref.op; +BaseView = require('../../base').BaseView; +_ref = require('./chart-option-model'), ChartOption = _ref.ChartOption, ChartOptionList = _ref.ChartOptionList; DEBOUNCE_RENDER = exports.DEBOUNCE_RENDER = 100; /** * @class View for a single configurable option in a chart type. @@ -9,7 +9,7 @@ DEBOUNCE_RENDER = exports.DEBOUNCE_RENDER = 100; ChartOptionView = exports.ChartOptionView = BaseView.extend({ tagName: 'section', className: 'chart-option field', - template: require('limn/template/chart/chart-option'), + template: require('../../template/chart/chart-option'), type: 'string', isCollapsed: true, events: { @@ -128,7 +128,7 @@ ChartOptionScaffold = exports.ChartOptionScaffold = BaseView.extend({ __bind__: ['addField'], tagName: 'form', className: 'chart-options scaffold', - template: require('limn/template/chart/chart-scaffold'), + template: require('../../template/chart/chart-scaffold'), collectionType: ChartOptionList, subviewType: ChartOptionView, events: { diff --git a/lib/chart/option/chart-option-view.mod.js b/lib/chart/option/chart-option-view.mod.js index a8f8a19..9fedde0 100644 --- a/lib/chart/option/chart-option-view.mod.js +++ b/lib/chart/option/chart-option-view.mod.js @@ -1,9 +1,9 @@ require.define('/node_modules/limn/chart/option/chart-option-view.js', function(require, module, exports, __dirname, __filename, undefined){ var op, BaseView, ChartOption, ChartOptionList, DEBOUNCE_RENDER, ChartOptionView, ChartOptionScaffold, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -BaseView = require('limn/base').BaseView; -_ref = require('limn/chart/option/chart-option-model'), ChartOption = _ref.ChartOption, ChartOptionList = _ref.ChartOptionList; +_ref = require('../../util'), _ = _ref._, op = _ref.op; +BaseView = require('../../base').BaseView; +_ref = require('./chart-option-model'), ChartOption = _ref.ChartOption, ChartOptionList = _ref.ChartOptionList; DEBOUNCE_RENDER = exports.DEBOUNCE_RENDER = 100; /** * @class View for a single configurable option in a chart type. @@ -11,7 +11,7 @@ DEBOUNCE_RENDER = exports.DEBOUNCE_RENDER = 100; ChartOptionView = exports.ChartOptionView = BaseView.extend({ tagName: 'section', className: 'chart-option field', - template: require('limn/template/chart/chart-option'), + template: require('../../template/chart/chart-option'), type: 'string', isCollapsed: true, events: { @@ -130,7 +130,7 @@ ChartOptionScaffold = exports.ChartOptionScaffold = BaseView.extend({ __bind__: ['addField'], tagName: 'form', className: 'chart-options scaffold', - template: require('limn/template/chart/chart-scaffold'), + template: require('../../template/chart/chart-scaffold'), collectionType: ChartOptionList, subviewType: ChartOptionView, events: { diff --git a/lib/chart/option/index.js b/lib/chart/option/index.js index b05b991..9c59fb5 100644 --- a/lib/chart/option/index.js +++ b/lib/chart/option/index.js @@ -1,6 +1,6 @@ var model, view; -model = require('limn/chart/option/chart-option-model'); -view = require('limn/chart/option/chart-option-view'); +model = require('./chart-option-model'); +view = require('./chart-option-view'); __import(__import(exports, model), view); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/chart/option/index.mod.js b/lib/chart/option/index.mod.js index aa94c03..d48b6e5 100644 --- a/lib/chart/option/index.mod.js +++ b/lib/chart/option/index.mod.js @@ -1,8 +1,8 @@ -require.define('/node_modules/limn/chart/option.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/chart/option/index.js', function(require, module, exports, __dirname, __filename, undefined){ var model, view; -model = require('limn/chart/option/chart-option-model'); -view = require('limn/chart/option/chart-option-view'); +model = require('./chart-option-model'); +view = require('./chart-option-view'); __import(__import(exports, model), view); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/chart/type/d3-chart.js b/lib/chart/type/d3-chart.js index 244a437..d5a5dbd 100644 --- a/lib/chart/type/d3-chart.js +++ b/lib/chart/type/d3-chart.js @@ -1,9 +1,9 @@ var d3, ColorBrewer, op, ChartType, D3ChartElement, root, D3ChartType, _ref, _; d3 = require('d3'); ColorBrewer = require('colorbrewer'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -ChartType = require('limn/chart/chart-type').ChartType; -D3ChartElement = require('limn/chart/type/d3/d3-chart-element').D3ChartElement; +_ref = require('../../../util'), _ = _ref._, op = _ref.op; +ChartType = require('../../chart-type').ChartType; +D3ChartElement = require('./d3-chart-element').D3ChartElement; root = function(){ return this; }(); diff --git a/lib/chart/type/d3-chart.mod.js b/lib/chart/type/d3-chart.mod.js index 324a2ce..a84a2d3 100644 --- a/lib/chart/type/d3-chart.mod.js +++ b/lib/chart/type/d3-chart.mod.js @@ -3,9 +3,9 @@ require.define('/node_modules/limn/chart/type/d3-chart.js', function(require, mo var d3, ColorBrewer, op, ChartType, D3ChartElement, root, D3ChartType, _ref, _; d3 = require('d3'); ColorBrewer = require('colorbrewer'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -ChartType = require('limn/chart/chart-type').ChartType; -D3ChartElement = require('limn/chart/type/d3/d3-chart-element').D3ChartElement; +_ref = require('../../../util'), _ = _ref._, op = _ref.op; +ChartType = require('../../chart-type').ChartType; +D3ChartElement = require('./d3-chart-element').D3ChartElement; root = function(){ return this; }(); diff --git a/lib/chart/type/d3/d3-bar-chart-type.js b/lib/chart/type/d3/d3-bar-chart-type.js index d9986f2..4e8fd18 100644 --- a/lib/chart/type/d3/d3-bar-chart-type.js +++ b/lib/chart/type/d3/d3-bar-chart-type.js @@ -1,7 +1,7 @@ var d3, op, ChartType, root, BarChartType, _ref, _; d3 = require('d3'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -ChartType = require('limn/chart/chart-type').ChartType; +_ref = require('../../../util'), _ = _ref._, op = _ref.op; +ChartType = require('../../chart-type').ChartType; root = function(){ return this; }(); diff --git a/lib/chart/type/d3/d3-bar-element.js b/lib/chart/type/d3/d3-bar-element.js index 357f44d..bf43875 100644 --- a/lib/chart/type/d3/d3-bar-element.js +++ b/lib/chart/type/d3/d3-bar-element.js @@ -1,8 +1,8 @@ var d3, op, D3ChartElement, root, BarChartType, _ref, _, _fmt; d3 = require('d3'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -D3ChartElement = require('limn/chart/type/d3/d3-chart-element').D3ChartElement; -_fmt = require('limn/util/formatters'); +_ref = require('../../../util'), _ = _ref._, op = _ref.op; +D3ChartElement = require('./d3-chart-element').D3ChartElement; +_fmt = require('../../../util/formatters'); root = function(){ return this; }(); diff --git a/lib/chart/type/d3/d3-bar-element.mod.js b/lib/chart/type/d3/d3-bar-element.mod.js index 5316769..549e311 100644 --- a/lib/chart/type/d3/d3-bar-element.mod.js +++ b/lib/chart/type/d3/d3-bar-element.mod.js @@ -2,9 +2,9 @@ require.define('/node_modules/limn/chart/type/d3/d3-bar-element.js', function(re var d3, op, D3ChartElement, root, BarChartType, _ref, _, _fmt; d3 = require('d3'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -D3ChartElement = require('limn/chart/type/d3/d3-chart-element').D3ChartElement; -_fmt = require('limn/util/formatters'); +_ref = require('../../../util'), _ = _ref._, op = _ref.op; +D3ChartElement = require('./d3-chart-element').D3ChartElement; +_fmt = require('../../../util/formatters'); root = function(){ return this; }(); diff --git a/lib/chart/type/d3/d3-chart-element.js b/lib/chart/type/d3/d3-chart-element.js index 3eaac59..45df35e 100644 --- a/lib/chart/type/d3/d3-chart-element.js +++ b/lib/chart/type/d3/d3-chart-element.js @@ -1,8 +1,8 @@ var d3, ColorBrewer, op, ReadyEmitter, root, KNOWN_CHART_ELEMENTS, D3ChartElement, _ref, _, __slice = [].slice; d3 = require('d3'); ColorBrewer = require('colorbrewer'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -ReadyEmitter = require('limn/util/event').ReadyEmitter; +_ref = require('../../../util'), _ = _ref._, op = _ref.op; +ReadyEmitter = require('../../../util/event').ReadyEmitter; root = function(){ return this; }(); diff --git a/lib/chart/type/d3/d3-chart-element.mod.js b/lib/chart/type/d3/d3-chart-element.mod.js index bf57c82..2d759d8 100644 --- a/lib/chart/type/d3/d3-chart-element.mod.js +++ b/lib/chart/type/d3/d3-chart-element.mod.js @@ -3,8 +3,8 @@ require.define('/node_modules/limn/chart/type/d3/d3-chart-element.js', function( var d3, ColorBrewer, op, ReadyEmitter, root, KNOWN_CHART_ELEMENTS, D3ChartElement, _ref, _, __slice = [].slice; d3 = require('d3'); ColorBrewer = require('colorbrewer'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -ReadyEmitter = require('limn/util/event').ReadyEmitter; +_ref = require('../../../util'), _ = _ref._, op = _ref.op; +ReadyEmitter = require('../../../util/event').ReadyEmitter; root = function(){ return this; }(); diff --git a/lib/chart/type/d3/d3-geo-element.js b/lib/chart/type/d3/d3-geo-element.js index 4540cea..83071e4 100644 --- a/lib/chart/type/d3/d3-geo-element.js +++ b/lib/chart/type/d3/d3-geo-element.js @@ -1,7 +1,7 @@ var ColorBrewer, op, ChartType, GeoWorldChartType, data, main, _ref, _; ColorBrewer = require('colorbrewer'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -ChartType = require('limn/chart/chart-type').ChartType; +_ref = require('../../../util'), _ = _ref._, op = _ref.op; +ChartType = require('../../chart-type').ChartType; exports.GeoWorldChartType = GeoWorldChartType = (function(superclass){ GeoWorldChartType.displayName = 'GeoWorldChartType'; var prototype = __extend(GeoWorldChartType, superclass).prototype, constructor = GeoWorldChartType; diff --git a/lib/chart/type/d3/d3-line-element.js b/lib/chart/type/d3/d3-line-element.js index f456f80..933cf37 100644 --- a/lib/chart/type/d3/d3-line-element.js +++ b/lib/chart/type/d3/d3-line-element.js @@ -1,9 +1,9 @@ var d3, ColorBrewer, op, D3ChartElement, root, LineChartElement, _ref, _, _fmt; d3 = require('d3'); ColorBrewer = require('colorbrewer'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -D3ChartElement = require('limn/chart/type/d3/d3-chart-element').D3ChartElement; -_fmt = require('limn/util/formatters'); +_ref = require('../../../util'), _ = _ref._, op = _ref.op; +D3ChartElement = require('./d3-chart-element').D3ChartElement; +_fmt = require('../../../util/formatters'); root = function(){ return this; }(); diff --git a/lib/chart/type/d3/d3-line-element.mod.js b/lib/chart/type/d3/d3-line-element.mod.js index b922b97..8c80d6c 100644 --- a/lib/chart/type/d3/d3-line-element.mod.js +++ b/lib/chart/type/d3/d3-line-element.mod.js @@ -3,9 +3,9 @@ require.define('/node_modules/limn/chart/type/d3/d3-line-element.js', function(r var d3, ColorBrewer, op, D3ChartElement, root, LineChartElement, _ref, _, _fmt; d3 = require('d3'); ColorBrewer = require('colorbrewer'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -D3ChartElement = require('limn/chart/type/d3/d3-chart-element').D3ChartElement; -_fmt = require('limn/util/formatters'); +_ref = require('../../../util'), _ = _ref._, op = _ref.op; +D3ChartElement = require('./d3-chart-element').D3ChartElement; +_fmt = require('../../../util/formatters'); root = function(){ return this; }(); diff --git a/lib/chart/type/d3/index.js b/lib/chart/type/d3/index.js index 76a5a17..edcbd97 100644 --- a/lib/chart/type/d3/index.js +++ b/lib/chart/type/d3/index.js @@ -1,7 +1,7 @@ var d3chart, line, bar; -d3chart = require('limn/chart/type/d3/d3-chart-element'); -line = require('limn/chart/type/d3/d3-line-element'); -bar = require('limn/chart/type/d3/d3-bar-element'); +d3chart = require('./d3-chart-element'); +line = require('./d3-line-element'); +bar = require('./d3-bar-element'); __import(__import(__import(exports, line), bar), d3chart); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/chart/type/d3/index.mod.js b/lib/chart/type/d3/index.mod.js index 7791108..2f7ef4e 100644 --- a/lib/chart/type/d3/index.mod.js +++ b/lib/chart/type/d3/index.mod.js @@ -1,9 +1,9 @@ -require.define('/node_modules/limn/chart/type/d3.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/chart/type/d3/index.js', function(require, module, exports, __dirname, __filename, undefined){ var d3chart, line, bar; -d3chart = require('limn/chart/type/d3/d3-chart-element'); -line = require('limn/chart/type/d3/d3-line-element'); -bar = require('limn/chart/type/d3/d3-bar-element'); +d3chart = require('./d3-chart-element'); +line = require('./d3-line-element'); +bar = require('./d3-bar-element'); __import(__import(__import(exports, line), bar), d3chart); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/chart/type/dygraphs.js b/lib/chart/type/dygraphs.js index 681c599..b5228d4 100644 --- a/lib/chart/type/dygraphs.js +++ b/lib/chart/type/dygraphs.js @@ -1,6 +1,6 @@ var ChartType, DygraphsChartType, _; -_ = require('limn/util/underscore'); -ChartType = require('limn/chart/chart-type').ChartType; +_ = require('../../../util/underscore'); +ChartType = require('../../chart-type').ChartType; exports.DygraphsChartType = DygraphsChartType = (function(superclass){ DygraphsChartType.displayName = 'DygraphsChartType'; var prototype = __extend(DygraphsChartType, superclass).prototype, constructor = DygraphsChartType; diff --git a/lib/chart/type/dygraphs.mod.js b/lib/chart/type/dygraphs.mod.js index 70b7821..44f190a 100644 --- a/lib/chart/type/dygraphs.mod.js +++ b/lib/chart/type/dygraphs.mod.js @@ -1,8 +1,8 @@ require.define('/node_modules/limn/chart/type/dygraphs.js', function(require, module, exports, __dirname, __filename, undefined){ var ChartType, DygraphsChartType, _; -_ = require('limn/util/underscore'); -ChartType = require('limn/chart/chart-type').ChartType; +_ = require('../../../util/underscore'); +ChartType = require('../../chart-type').ChartType; exports.DygraphsChartType = DygraphsChartType = (function(superclass){ DygraphsChartType.displayName = 'DygraphsChartType'; var prototype = __extend(DygraphsChartType, superclass).prototype, constructor = DygraphsChartType; diff --git a/lib/chart/type/index.mod.js b/lib/chart/type/index.mod.js index ac2813f..0c141b4 100644 --- a/lib/chart/type/index.mod.js +++ b/lib/chart/type/index.mod.js @@ -1,4 +1,4 @@ -require.define('/node_modules/limn/chart/type.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/chart/type/index.js', function(require, module, exports, __dirname, __filename, undefined){ diff --git a/lib/dashboard/dashboard-model.js b/lib/dashboard/dashboard-model.js index 5307c4c..48393b4 100644 --- a/lib/dashboard/dashboard-model.js +++ b/lib/dashboard/dashboard-model.js @@ -1,8 +1,8 @@ var Seq, op, BaseModel, Graph, GraphList, Dashboard, _ref, _; Seq = require('seq'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -BaseModel = require('limn/base').BaseModel; -_ref = require('limn/graph/graph-model'), Graph = _ref.Graph, GraphList = _ref.GraphList; +_ref = require('../util'), _ = _ref._, op = _ref.op; +BaseModel = require('../base').BaseModel; +_ref = require('../graph/graph-model'), Graph = _ref.Graph, GraphList = _ref.GraphList; /** * @class */ diff --git a/lib/dashboard/dashboard-model.mod.js b/lib/dashboard/dashboard-model.mod.js index ba65ca3..09c1307 100644 --- a/lib/dashboard/dashboard-model.mod.js +++ b/lib/dashboard/dashboard-model.mod.js @@ -2,9 +2,9 @@ require.define('/node_modules/limn/dashboard/dashboard-model.js', function(requi var Seq, op, BaseModel, Graph, GraphList, Dashboard, _ref, _; Seq = require('seq'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -BaseModel = require('limn/base').BaseModel; -_ref = require('limn/graph/graph-model'), Graph = _ref.Graph, GraphList = _ref.GraphList; +_ref = require('../util'), _ = _ref._, op = _ref.op; +BaseModel = require('../base').BaseModel; +_ref = require('../graph/graph-model'), Graph = _ref.Graph, GraphList = _ref.GraphList; /** * @class */ diff --git a/lib/dashboard/dashboard-view.js b/lib/dashboard/dashboard-view.js index 7f572b9..ccd6b9f 100644 --- a/lib/dashboard/dashboard-view.js +++ b/lib/dashboard/dashboard-view.js @@ -1,9 +1,9 @@ var Seq, op, BaseModel, BaseView, Graph, GraphList, GraphDisplayView, Dashboard, DashboardView, DashboardTabView, _ref, _; Seq = require('seq'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseView = _ref.BaseView; -_ref = require('limn/graph'), Graph = _ref.Graph, GraphList = _ref.GraphList, GraphDisplayView = _ref.GraphDisplayView; -Dashboard = require('limn/dashboard/dashboard-model').Dashboard; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseView = _ref.BaseView; +_ref = require('../graph'), Graph = _ref.Graph, GraphList = _ref.GraphList, GraphDisplayView = _ref.GraphDisplayView; +Dashboard = require('./dashboard-model').Dashboard; /** * @class */ @@ -11,7 +11,7 @@ DashboardView = exports.DashboardView = BaseView.extend({ __bind__: ['addTab'], tagName: 'section', className: 'dashboard', - template: require('limn/template/dashboard/dashboard'), + template: require('../template/dashboard/dashboard'), events: { 'click .graphs.tabbable .nav a': 'onTabClick', 'shown .graphs.tabbable .nav a': 'render' @@ -126,7 +126,7 @@ DashboardTabView = exports.DashboardTabView = BaseView.extend({ __bind__: [], className: 'tab-pane', tag: 'div', - template: require('limn/template/dashboard/dashboard-tab'), + template: require('../template/dashboard/dashboard-tab'), constructor: (function(){ function DashboardTabView(){ return BaseView.apply(this, arguments); diff --git a/lib/dashboard/dashboard-view.mod.js b/lib/dashboard/dashboard-view.mod.js index 3aade19..33edbfc 100644 --- a/lib/dashboard/dashboard-view.mod.js +++ b/lib/dashboard/dashboard-view.mod.js @@ -2,10 +2,10 @@ require.define('/node_modules/limn/dashboard/dashboard-view.js', function(requir var Seq, op, BaseModel, BaseView, Graph, GraphList, GraphDisplayView, Dashboard, DashboardView, DashboardTabView, _ref, _; Seq = require('seq'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseView = _ref.BaseView; -_ref = require('limn/graph'), Graph = _ref.Graph, GraphList = _ref.GraphList, GraphDisplayView = _ref.GraphDisplayView; -Dashboard = require('limn/dashboard/dashboard-model').Dashboard; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseView = _ref.BaseView; +_ref = require('../graph'), Graph = _ref.Graph, GraphList = _ref.GraphList, GraphDisplayView = _ref.GraphDisplayView; +Dashboard = require('./dashboard-model').Dashboard; /** * @class */ @@ -13,7 +13,7 @@ DashboardView = exports.DashboardView = BaseView.extend({ __bind__: ['addTab'], tagName: 'section', className: 'dashboard', - template: require('limn/template/dashboard/dashboard'), + template: require('../template/dashboard/dashboard'), events: { 'click .graphs.tabbable .nav a': 'onTabClick', 'shown .graphs.tabbable .nav a': 'render' @@ -128,7 +128,7 @@ DashboardTabView = exports.DashboardTabView = BaseView.extend({ __bind__: [], className: 'tab-pane', tag: 'div', - template: require('limn/template/dashboard/dashboard-tab'), + template: require('../template/dashboard/dashboard-tab'), constructor: (function(){ function DashboardTabView(){ return BaseView.apply(this, arguments); diff --git a/lib/dashboard/index.js b/lib/dashboard/index.js index 21910cb..8094ea9 100644 --- a/lib/dashboard/index.js +++ b/lib/dashboard/index.js @@ -1,6 +1,6 @@ var models, views; -models = require('limn/dashboard/dashboard-model'); -views = require('limn/dashboard/dashboard-view'); +models = require('./dashboard-model'); +views = require('./dashboard-view'); __import(__import(exports, models), views); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/dashboard/index.mod.js b/lib/dashboard/index.mod.js index 8020112..32dde90 100644 --- a/lib/dashboard/index.mod.js +++ b/lib/dashboard/index.mod.js @@ -1,8 +1,8 @@ -require.define('/node_modules/limn/dashboard.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/dashboard/index.js', function(require, module, exports, __dirname, __filename, undefined){ var models, views; -models = require('limn/dashboard/dashboard-model'); -views = require('limn/dashboard/dashboard-view'); +models = require('./dashboard-model'); +views = require('./dashboard-view'); __import(__import(exports, models), views); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/data/data-view.js b/lib/data/data-view.js index 2d52977..5d2cd44 100644 --- a/lib/data/data-view.js +++ b/lib/data/data-view.js @@ -1,10 +1,10 @@ var Seq, op, BaseView, ViewList, DataSetView, MetricEditView, DataSource, DataView, _ref, _; Seq = require('seq'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base'), BaseView = _ref.BaseView, ViewList = _ref.ViewList; -DataSetView = require('limn/data/dataset-view').DataSetView; -MetricEditView = require('limn/data/metric-edit-view').MetricEditView; -DataSource = require('limn/data/datasource-model').DataSource; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../base'), BaseView = _ref.BaseView, ViewList = _ref.ViewList; +DataSetView = require('./dataset-view').DataSetView; +MetricEditView = require('./metric-edit-view').MetricEditView; +DataSource = require('./datasource-model').DataSource; /** * @class DataSet selection and customization UI (root of the `data` tab). */ @@ -12,7 +12,7 @@ DataView = exports.DataView = BaseView.extend({ __bind__: ['onMetricsChanged'], tagName: 'section', className: 'data-ui', - template: require('limn/template/data/data'), + template: require('../template/data/data'), datasources: null /** * @constructor diff --git a/lib/data/data-view.mod.js b/lib/data/data-view.mod.js index 1507b09..48857e7 100644 --- a/lib/data/data-view.mod.js +++ b/lib/data/data-view.mod.js @@ -2,11 +2,11 @@ require.define('/node_modules/limn/data/data-view.js', function(require, module, var Seq, op, BaseView, ViewList, DataSetView, MetricEditView, DataSource, DataView, _ref, _; Seq = require('seq'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base'), BaseView = _ref.BaseView, ViewList = _ref.ViewList; -DataSetView = require('limn/data/dataset-view').DataSetView; -MetricEditView = require('limn/data/metric-edit-view').MetricEditView; -DataSource = require('limn/data/datasource-model').DataSource; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../base'), BaseView = _ref.BaseView, ViewList = _ref.ViewList; +DataSetView = require('./dataset-view').DataSetView; +MetricEditView = require('./metric-edit-view').MetricEditView; +DataSource = require('./datasource-model').DataSource; /** * @class DataSet selection and customization UI (root of the `data` tab). */ @@ -14,7 +14,7 @@ DataView = exports.DataView = BaseView.extend({ __bind__: ['onMetricsChanged'], tagName: 'section', className: 'data-ui', - template: require('limn/template/data/data'), + template: require('../template/data/data'), datasources: null /** * @constructor diff --git a/lib/data/dataset-model.js b/lib/data/dataset-model.js index c9b1045..906cc21 100644 --- a/lib/data/dataset-model.js +++ b/lib/data/dataset-model.js @@ -1,10 +1,10 @@ var Seq, ColorBrewer, op, BaseModel, BaseList, Metric, MetricList, DataSource, DataSourceList, DataSet, _ref, _; Seq = require('seq'); ColorBrewer = require('colorbrewer'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; -_ref = require('limn/data/metric-model'), Metric = _ref.Metric, MetricList = _ref.MetricList; -_ref = require('limn/data/datasource-model'), DataSource = _ref.DataSource, DataSourceList = _ref.DataSourceList; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +_ref = require('./metric-model'), Metric = _ref.Metric, MetricList = _ref.MetricList; +_ref = require('./datasource-model'), DataSource = _ref.DataSource, DataSourceList = _ref.DataSourceList; /** * @class */ diff --git a/lib/data/dataset-model.mod.js b/lib/data/dataset-model.mod.js index e32a638..345a230 100644 --- a/lib/data/dataset-model.mod.js +++ b/lib/data/dataset-model.mod.js @@ -3,10 +3,10 @@ require.define('/node_modules/limn/data/dataset-model.js', function(require, mod var Seq, ColorBrewer, op, BaseModel, BaseList, Metric, MetricList, DataSource, DataSourceList, DataSet, _ref, _; Seq = require('seq'); ColorBrewer = require('colorbrewer'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; -_ref = require('limn/data/metric-model'), Metric = _ref.Metric, MetricList = _ref.MetricList; -_ref = require('limn/data/datasource-model'), DataSource = _ref.DataSource, DataSourceList = _ref.DataSourceList; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +_ref = require('./metric-model'), Metric = _ref.Metric, MetricList = _ref.MetricList; +_ref = require('./datasource-model'), DataSource = _ref.DataSource, DataSourceList = _ref.DataSourceList; /** * @class */ diff --git a/lib/data/dataset-view.js b/lib/data/dataset-view.js index da7bab3..b630760 100644 --- a/lib/data/dataset-view.js +++ b/lib/data/dataset-view.js @@ -1,13 +1,13 @@ var op, BaseView, DataSetView, DataSetMetricView, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -BaseView = require('limn/base').BaseView; +_ref = require('../util'), _ = _ref._, op = _ref.op; +BaseView = require('../base').BaseView; /** * @class */ DataSetView = exports.DataSetView = BaseView.extend({ tagName: 'section', className: 'dataset-ui dataset', - template: require('limn/template/data/dataset'), + template: require('../template/data/dataset'), events: { 'click .new-metric-button': 'onNewMetric', 'click .delete-metric-button': 'onDeleteMetric', @@ -106,7 +106,7 @@ DataSetView = exports.DataSetView = BaseView.extend({ DataSetMetricView = exports.DataSetMetricView = BaseView.extend({ tagName: 'tr', className: 'dataset-metric metric', - template: require('limn/template/data/dataset-metric'), + template: require('../template/data/dataset-metric'), constructor: (function(){ function DataSetMetricView(){ return BaseView.apply(this, arguments); diff --git a/lib/data/dataset-view.mod.js b/lib/data/dataset-view.mod.js index 09462e5..deba546 100644 --- a/lib/data/dataset-view.mod.js +++ b/lib/data/dataset-view.mod.js @@ -1,15 +1,15 @@ require.define('/node_modules/limn/data/dataset-view.js', function(require, module, exports, __dirname, __filename, undefined){ var op, BaseView, DataSetView, DataSetMetricView, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -BaseView = require('limn/base').BaseView; +_ref = require('../util'), _ = _ref._, op = _ref.op; +BaseView = require('../base').BaseView; /** * @class */ DataSetView = exports.DataSetView = BaseView.extend({ tagName: 'section', className: 'dataset-ui dataset', - template: require('limn/template/data/dataset'), + template: require('../template/data/dataset'), events: { 'click .new-metric-button': 'onNewMetric', 'click .delete-metric-button': 'onDeleteMetric', @@ -108,7 +108,7 @@ DataSetView = exports.DataSetView = BaseView.extend({ DataSetMetricView = exports.DataSetMetricView = BaseView.extend({ tagName: 'tr', className: 'dataset-metric metric', - template: require('limn/template/data/dataset-metric'), + template: require('../template/data/dataset-metric'), constructor: (function(){ function DataSetMetricView(){ return BaseView.apply(this, arguments); diff --git a/lib/data/datasource-model.js b/lib/data/datasource-model.js index 84b3c78..9af7647 100644 --- a/lib/data/datasource-model.js +++ b/lib/data/datasource-model.js @@ -1,8 +1,8 @@ var op, TimeSeriesData, CSVData, BaseModel, BaseList, ModelCache, Metric, MetricList, DataSource, DataSourceList, ALL_SOURCES, sourceCache, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/util/timeseries'), TimeSeriesData = _ref.TimeSeriesData, CSVData = _ref.CSVData; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, ModelCache = _ref.ModelCache; -_ref = require('limn/data/metric-model'), Metric = _ref.Metric, MetricList = _ref.MetricList; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../util/timeseries'), TimeSeriesData = _ref.TimeSeriesData, CSVData = _ref.CSVData; +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, ModelCache = _ref.ModelCache; +_ref = require('./metric-model'), Metric = _ref.Metric, MetricList = _ref.MetricList; /** * @class */ diff --git a/lib/data/datasource-model.mod.js b/lib/data/datasource-model.mod.js index 2155d0c..30a8182 100644 --- a/lib/data/datasource-model.mod.js +++ b/lib/data/datasource-model.mod.js @@ -1,10 +1,10 @@ require.define('/node_modules/limn/data/datasource-model.js', function(require, module, exports, __dirname, __filename, undefined){ var op, TimeSeriesData, CSVData, BaseModel, BaseList, ModelCache, Metric, MetricList, DataSource, DataSourceList, ALL_SOURCES, sourceCache, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/util/timeseries'), TimeSeriesData = _ref.TimeSeriesData, CSVData = _ref.CSVData; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, ModelCache = _ref.ModelCache; -_ref = require('limn/data/metric-model'), Metric = _ref.Metric, MetricList = _ref.MetricList; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../util/timeseries'), TimeSeriesData = _ref.TimeSeriesData, CSVData = _ref.CSVData; +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, ModelCache = _ref.ModelCache; +_ref = require('./metric-model'), Metric = _ref.Metric, MetricList = _ref.MetricList; /** * @class */ diff --git a/lib/data/datasource-ui-view.js b/lib/data/datasource-ui-view.js index 9328f8a..9bdacd0 100644 --- a/lib/data/datasource-ui-view.js +++ b/lib/data/datasource-ui-view.js @@ -1,6 +1,6 @@ var op, BaseModel, BaseList, BaseView, DataSourceUIView, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView; /** * @class * Model is a Metric. @@ -9,7 +9,7 @@ DataSourceUIView = exports.DataSourceUIView = BaseView.extend({ __bind__: [], tagName: 'section', className: 'datasource-ui', - template: require('limn/template/data/datasource-ui'), + template: require('../template/data/datasource-ui'), events: { 'click .datasource-summary': 'onHeaderClick', 'click .datasource-source-metric': 'onSelectMetric' diff --git a/lib/data/datasource-ui-view.mod.js b/lib/data/datasource-ui-view.mod.js index e5a57d4..ff7f6e0 100644 --- a/lib/data/datasource-ui-view.mod.js +++ b/lib/data/datasource-ui-view.mod.js @@ -1,8 +1,8 @@ require.define('/node_modules/limn/data/datasource-ui-view.js', function(require, module, exports, __dirname, __filename, undefined){ var op, BaseModel, BaseList, BaseView, DataSourceUIView, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView; /** * @class * Model is a Metric. @@ -11,7 +11,7 @@ DataSourceUIView = exports.DataSourceUIView = BaseView.extend({ __bind__: [], tagName: 'section', className: 'datasource-ui', - template: require('limn/template/data/datasource-ui'), + template: require('../template/data/datasource-ui'), events: { 'click .datasource-summary': 'onHeaderClick', 'click .datasource-source-metric': 'onSelectMetric' diff --git a/lib/data/datasource-view.js b/lib/data/datasource-view.js index 0088fc1..293a7f1 100644 --- a/lib/data/datasource-view.js +++ b/lib/data/datasource-view.js @@ -1,6 +1,6 @@ var op, BaseModel, BaseList, BaseView, DataSourceView, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView; /** * @class */ @@ -8,7 +8,7 @@ DataSourceView = exports.DataSourceView = BaseView.extend({ __bind__: [], tagName: 'section', className: 'datasource', - template: require('limn/template/data/datasource'), + template: require('../template/data/datasource'), constructor: (function(){ function DataSourceView(){ return BaseView.apply(this, arguments); diff --git a/lib/data/datasource-view.mod.js b/lib/data/datasource-view.mod.js index 0adff99..45a0c7e 100644 --- a/lib/data/datasource-view.mod.js +++ b/lib/data/datasource-view.mod.js @@ -1,8 +1,8 @@ require.define('/node_modules/limn/data/datasource-view.js', function(require, module, exports, __dirname, __filename, undefined){ var op, BaseModel, BaseList, BaseView, DataSourceView, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView; +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView; /** * @class */ @@ -10,7 +10,7 @@ DataSourceView = exports.DataSourceView = BaseView.extend({ __bind__: [], tagName: 'section', className: 'datasource', - template: require('limn/template/data/datasource'), + template: require('../template/data/datasource'), constructor: (function(){ function DataSourceView(){ return BaseView.apply(this, arguments); diff --git a/lib/data/index.js b/lib/data/index.js index 4eb1308..11101c8 100644 --- a/lib/data/index.js +++ b/lib/data/index.js @@ -1,12 +1,12 @@ var metric_model, metric_edit_view, datasource_model, datasource_view, datasource_ui_view, dataset_model, dataset_view, data_view; -metric_model = require('limn/data/metric-model'); -metric_edit_view = require('limn/data/metric-edit-view'); -datasource_model = require('limn/data/datasource-model'); -datasource_view = require('limn/data/datasource-view'); -datasource_ui_view = require('limn/data/datasource-ui-view'); -dataset_model = require('limn/data/dataset-model'); -dataset_view = require('limn/data/dataset-view'); -data_view = require('limn/data/data-view'); +metric_model = require('./metric-model'); +metric_edit_view = require('./metric-edit-view'); +datasource_model = require('./datasource-model'); +datasource_view = require('./datasource-view'); +datasource_ui_view = require('./datasource-ui-view'); +dataset_model = require('./dataset-model'); +dataset_view = require('./dataset-view'); +data_view = require('./data-view'); __import(__import(__import(__import(__import(__import(__import(__import(exports, datasource_model), datasource_view), datasource_ui_view), dataset_model), dataset_view), metric_model), metric_edit_view), data_view); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/data/index.mod.js b/lib/data/index.mod.js index 1ddf4c1..ebb1641 100644 --- a/lib/data/index.mod.js +++ b/lib/data/index.mod.js @@ -1,14 +1,14 @@ -require.define('/node_modules/limn/data.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/data/index.js', function(require, module, exports, __dirname, __filename, undefined){ var metric_model, metric_edit_view, datasource_model, datasource_view, datasource_ui_view, dataset_model, dataset_view, data_view; -metric_model = require('limn/data/metric-model'); -metric_edit_view = require('limn/data/metric-edit-view'); -datasource_model = require('limn/data/datasource-model'); -datasource_view = require('limn/data/datasource-view'); -datasource_ui_view = require('limn/data/datasource-ui-view'); -dataset_model = require('limn/data/dataset-model'); -dataset_view = require('limn/data/dataset-view'); -data_view = require('limn/data/data-view'); +metric_model = require('./metric-model'); +metric_edit_view = require('./metric-edit-view'); +datasource_model = require('./datasource-model'); +datasource_view = require('./datasource-view'); +datasource_ui_view = require('./datasource-ui-view'); +dataset_model = require('./dataset-model'); +dataset_view = require('./dataset-view'); +data_view = require('./data-view'); __import(__import(__import(__import(__import(__import(__import(__import(exports, datasource_model), datasource_view), datasource_ui_view), dataset_model), dataset_view), metric_model), metric_edit_view), data_view); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/data/metric-edit-view.js b/lib/data/metric-edit-view.js index af85b30..329dd54 100644 --- a/lib/data/metric-edit-view.js +++ b/lib/data/metric-edit-view.js @@ -1,8 +1,8 @@ var op, BaseView, Metric, DataSourceUIView, MetricEditView, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -BaseView = require('limn/base').BaseView; -Metric = require('limn/data/metric-model').Metric; -DataSourceUIView = require('limn/data/datasource-ui-view').DataSourceUIView; +_ref = require('../util'), _ = _ref._, op = _ref.op; +BaseView = require('../base').BaseView; +Metric = require('./metric-model').Metric; +DataSourceUIView = require('./datasource-ui-view').DataSourceUIView; /** * @class * Model is a Metric. @@ -11,7 +11,7 @@ MetricEditView = exports.MetricEditView = BaseView.extend({ __bind__: ['onChange'], tagName: 'section', className: 'metric-edit-ui', - template: require('limn/template/data/metric-edit'), + template: require('../template/data/metric-edit'), callOnReturnKeypress: 'onChange', events: { 'keydown .metric-label': 'onReturnKeypress' diff --git a/lib/data/metric-edit-view.mod.js b/lib/data/metric-edit-view.mod.js index 0218ba0..70861cb 100644 --- a/lib/data/metric-edit-view.mod.js +++ b/lib/data/metric-edit-view.mod.js @@ -1,10 +1,10 @@ require.define('/node_modules/limn/data/metric-edit-view.js', function(require, module, exports, __dirname, __filename, undefined){ var op, BaseView, Metric, DataSourceUIView, MetricEditView, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -BaseView = require('limn/base').BaseView; -Metric = require('limn/data/metric-model').Metric; -DataSourceUIView = require('limn/data/datasource-ui-view').DataSourceUIView; +_ref = require('../util'), _ = _ref._, op = _ref.op; +BaseView = require('../base').BaseView; +Metric = require('./metric-model').Metric; +DataSourceUIView = require('./datasource-ui-view').DataSourceUIView; /** * @class * Model is a Metric. @@ -13,7 +13,7 @@ MetricEditView = exports.MetricEditView = BaseView.extend({ __bind__: ['onChange'], tagName: 'section', className: 'metric-edit-ui', - template: require('limn/template/data/metric-edit'), + template: require('../template/data/metric-edit'), callOnReturnKeypress: 'onChange', events: { 'keydown .metric-label': 'onReturnKeypress' diff --git a/lib/data/metric-model.js b/lib/data/metric-model.js index 853c213..34cc8e4 100644 --- a/lib/data/metric-model.js +++ b/lib/data/metric-model.js @@ -1,7 +1,7 @@ var op, BaseModel, BaseList, ProjectColors, DataSourceList, DataSource, Metric, MetricList, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; -ProjectColors = require('limn/data/project-colors'); +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +ProjectColors = require('./project-colors'); DataSource = DataSourceList = null; /** * @class @@ -176,5 +176,5 @@ MetricList = exports.MetricList = BaseList.extend({ }); setTimeout(function(){ var _ref; - return _ref = require('limn/data/datasource-model'), DataSource = _ref.DataSource, DataSourceList = _ref.DataSourceList, _ref; + return _ref = require('./datasource-model'), DataSource = _ref.DataSource, DataSourceList = _ref.DataSourceList, _ref; }, 10); \ No newline at end of file diff --git a/lib/data/metric-model.mod.js b/lib/data/metric-model.mod.js index 053b7f5..acef46d 100644 --- a/lib/data/metric-model.mod.js +++ b/lib/data/metric-model.mod.js @@ -1,9 +1,9 @@ require.define('/node_modules/limn/data/metric-model.js', function(require, module, exports, __dirname, __filename, undefined){ var op, BaseModel, BaseList, ProjectColors, DataSourceList, DataSource, Metric, MetricList, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; -ProjectColors = require('limn/data/project-colors'); +_ref = require('../util'), _ = _ref._, op = _ref.op; +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +ProjectColors = require('./project-colors'); DataSource = DataSourceList = null; /** * @class @@ -178,7 +178,7 @@ MetricList = exports.MetricList = BaseList.extend({ }); setTimeout(function(){ var _ref; - return _ref = require('limn/data/datasource-model'), DataSource = _ref.DataSource, DataSourceList = _ref.DataSourceList, _ref; + return _ref = require('./datasource-model'), DataSource = _ref.DataSource, DataSourceList = _ref.DataSourceList, _ref; }, 10); }); diff --git a/lib/graph/graph-display-view.js b/lib/graph/graph-display-view.js index fdafaeb..78d7453 100644 --- a/lib/graph/graph-display-view.js +++ b/lib/graph/graph-display-view.js @@ -1,8 +1,8 @@ var moment, op, Graph, GraphView, root, GraphDisplayView, _ref, _; moment = require('moment'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -Graph = require('limn/graph/graph-model').Graph; -GraphView = require('limn/graph/graph-view').GraphView; +_ref = require('../util'), _ = _ref._, op = _ref.op; +Graph = require('./graph-model').Graph; +GraphView = require('./graph-view').GraphView; root = function(){ return this; }(); @@ -12,7 +12,7 @@ root = function(){ GraphDisplayView = exports.GraphDisplayView = GraphView.extend({ tagName: 'section', className: 'graph graph-display', - template: require('limn/template/graph/graph-display'), + template: require('../template/graph/graph-display'), events: { 'focus .graph-permalink input': 'onPermalinkFocus', 'click .export-button': 'exportChart' diff --git a/lib/graph/graph-display-view.mod.js b/lib/graph/graph-display-view.mod.js index 64bd1c7..b70bee0 100644 --- a/lib/graph/graph-display-view.mod.js +++ b/lib/graph/graph-display-view.mod.js @@ -2,9 +2,9 @@ require.define('/node_modules/limn/graph/graph-display-view.js', function(requir var moment, op, Graph, GraphView, root, GraphDisplayView, _ref, _; moment = require('moment'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -Graph = require('limn/graph/graph-model').Graph; -GraphView = require('limn/graph/graph-view').GraphView; +_ref = require('../util'), _ = _ref._, op = _ref.op; +Graph = require('./graph-model').Graph; +GraphView = require('./graph-view').GraphView; root = function(){ return this; }(); @@ -14,7 +14,7 @@ root = function(){ GraphDisplayView = exports.GraphDisplayView = GraphView.extend({ tagName: 'section', className: 'graph graph-display', - template: require('limn/template/graph/graph-display'), + template: require('../template/graph/graph-display'), events: { 'focus .graph-permalink input': 'onPermalinkFocus', 'click .export-button': 'exportChart' diff --git a/lib/graph/graph-edit-view.js b/lib/graph/graph-edit-view.js index 9551a9b..33691ab 100644 --- a/lib/graph/graph-edit-view.js +++ b/lib/graph/graph-edit-view.js @@ -1,10 +1,10 @@ var moment, Graph, GraphView, ChartOptionScaffold, DEBOUNCE_RENDER, DataView, DataSetView, DataSet, root, GraphEditView, _, _ref; moment = require('moment'); -_ = require('limn/util/underscore'); -Graph = require('limn/graph/graph-model').Graph; -GraphView = require('limn/graph/graph-view').GraphView; -_ref = require('limn/chart'), ChartOptionScaffold = _ref.ChartOptionScaffold, DEBOUNCE_RENDER = _ref.DEBOUNCE_RENDER; -_ref = require('limn/data'), DataView = _ref.DataView, DataSetView = _ref.DataSetView, DataSet = _ref.DataSet; +_ = require('../util/underscore'); +Graph = require('./graph-model').Graph; +GraphView = require('./graph-view').GraphView; +_ref = require('../chart'), ChartOptionScaffold = _ref.ChartOptionScaffold, DEBOUNCE_RENDER = _ref.DEBOUNCE_RENDER; +_ref = require('../data'), DataView = _ref.DataView, DataSetView = _ref.DataSetView, DataSet = _ref.DataSet; root = function(){ return this; }(); @@ -16,7 +16,7 @@ root = function(){ GraphEditView = exports.GraphEditView = GraphView.extend({ __bind__: ['wait', 'unwait', 'onChartTypeReady', 'onScaffoldChange', 'onFirstClickRenderOptionsTab', 'onFirstClickRenderDataTab'], className: 'graph-edit graph', - template: require('limn/template/graph/graph-edit'), + template: require('../template/graph/graph-edit'), events: { 'click .redraw-button': 'stopAndRender', 'click .load-button': 'load', diff --git a/lib/graph/graph-edit-view.mod.js b/lib/graph/graph-edit-view.mod.js index 82aa5da..0ff633e 100644 --- a/lib/graph/graph-edit-view.mod.js +++ b/lib/graph/graph-edit-view.mod.js @@ -2,11 +2,11 @@ require.define('/node_modules/limn/graph/graph-edit-view.js', function(require, var moment, Graph, GraphView, ChartOptionScaffold, DEBOUNCE_RENDER, DataView, DataSetView, DataSet, root, GraphEditView, _, _ref; moment = require('moment'); -_ = require('limn/util/underscore'); -Graph = require('limn/graph/graph-model').Graph; -GraphView = require('limn/graph/graph-view').GraphView; -_ref = require('limn/chart'), ChartOptionScaffold = _ref.ChartOptionScaffold, DEBOUNCE_RENDER = _ref.DEBOUNCE_RENDER; -_ref = require('limn/data'), DataView = _ref.DataView, DataSetView = _ref.DataSetView, DataSet = _ref.DataSet; +_ = require('../util/underscore'); +Graph = require('./graph-model').Graph; +GraphView = require('./graph-view').GraphView; +_ref = require('../chart'), ChartOptionScaffold = _ref.ChartOptionScaffold, DEBOUNCE_RENDER = _ref.DEBOUNCE_RENDER; +_ref = require('../data'), DataView = _ref.DataView, DataSetView = _ref.DataSetView, DataSet = _ref.DataSet; root = function(){ return this; }(); @@ -18,7 +18,7 @@ root = function(){ GraphEditView = exports.GraphEditView = GraphView.extend({ __bind__: ['wait', 'unwait', 'onChartTypeReady', 'onScaffoldChange', 'onFirstClickRenderOptionsTab', 'onFirstClickRenderDataTab'], className: 'graph-edit graph', - template: require('limn/template/graph/graph-edit'), + template: require('../template/graph/graph-edit'), events: { 'click .redraw-button': 'stopAndRender', 'click .load-button': 'load', diff --git a/lib/graph/graph-list-view.js b/lib/graph/graph-list-view.js index c5c16f5..3d4e55b 100644 --- a/lib/graph/graph-list-view.js +++ b/lib/graph/graph-list-view.js @@ -1,7 +1,7 @@ var op, BaseView, Graph, GraphList, root, DEBOUNCE_RENDER, GraphListView, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -BaseView = require('limn/base').BaseView; -_ref = require('limn/graph/graph-model'), Graph = _ref.Graph, GraphList = _ref.GraphList; +_ref = require('../util'), _ = _ref._, op = _ref.op; +BaseView = require('../base').BaseView; +_ref = require('./graph-model'), Graph = _ref.Graph, GraphList = _ref.GraphList; root = function(){ return this; }(); @@ -14,7 +14,7 @@ GraphListView = exports.GraphListView = BaseView.extend({ __debounce__: ['render'], tagName: 'section', className: 'graph-list-view', - template: require('limn/template/graph/graph-list'), + template: require('../template/graph/graph-list'), data: {}, ready: false, initialize: function(){ diff --git a/lib/graph/graph-list-view.mod.js b/lib/graph/graph-list-view.mod.js index caf8621..1eaca16 100644 --- a/lib/graph/graph-list-view.mod.js +++ b/lib/graph/graph-list-view.mod.js @@ -1,9 +1,9 @@ require.define('/node_modules/limn/graph/graph-list-view.js', function(require, module, exports, __dirname, __filename, undefined){ var op, BaseView, Graph, GraphList, root, DEBOUNCE_RENDER, GraphListView, _ref, _; -_ref = require('limn/util'), _ = _ref._, op = _ref.op; -BaseView = require('limn/base').BaseView; -_ref = require('limn/graph/graph-model'), Graph = _ref.Graph, GraphList = _ref.GraphList; +_ref = require('../util'), _ = _ref._, op = _ref.op; +BaseView = require('../base').BaseView; +_ref = require('./graph-model'), Graph = _ref.Graph, GraphList = _ref.GraphList; root = function(){ return this; }(); @@ -16,7 +16,7 @@ GraphListView = exports.GraphListView = BaseView.extend({ __debounce__: ['render'], tagName: 'section', className: 'graph-list-view', - template: require('limn/template/graph/graph-list'), + template: require('../template/graph/graph-list'), data: {}, ready: false, initialize: function(){ diff --git a/lib/graph/graph-model.js b/lib/graph/graph-model.js index dd6da88..79428cd 100644 --- a/lib/graph/graph-model.js +++ b/lib/graph/graph-model.js @@ -1,9 +1,9 @@ var Seq, Cascade, BaseModel, BaseList, ModelCache, ChartType, DataSet, root, Graph, GraphList, _ref, _; Seq = require('seq'); -_ref = require('limn/util'), _ = _ref._, Cascade = _ref.Cascade; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, ModelCache = _ref.ModelCache; -ChartType = require('limn/chart').ChartType; -DataSet = require('limn/data').DataSet; +_ref = require('../util'), _ = _ref._, Cascade = _ref.Cascade; +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, ModelCache = _ref.ModelCache; +ChartType = require('../chart').ChartType; +DataSet = require('../data').DataSet; root = function(){ return this; }(); diff --git a/lib/graph/graph-model.mod.js b/lib/graph/graph-model.mod.js index 725d971..c511d60 100644 --- a/lib/graph/graph-model.mod.js +++ b/lib/graph/graph-model.mod.js @@ -2,10 +2,10 @@ require.define('/node_modules/limn/graph/graph-model.js', function(require, modu var Seq, Cascade, BaseModel, BaseList, ModelCache, ChartType, DataSet, root, Graph, GraphList, _ref, _; Seq = require('seq'); -_ref = require('limn/util'), _ = _ref._, Cascade = _ref.Cascade; -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, ModelCache = _ref.ModelCache; -ChartType = require('limn/chart').ChartType; -DataSet = require('limn/data').DataSet; +_ref = require('../util'), _ = _ref._, Cascade = _ref.Cascade; +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, ModelCache = _ref.ModelCache; +ChartType = require('../chart').ChartType; +DataSet = require('../data').DataSet; root = function(){ return this; }(); diff --git a/lib/graph/graph-view.js b/lib/graph/graph-view.js index 19664e6..7cb124b 100644 --- a/lib/graph/graph-view.js +++ b/lib/graph/graph-view.js @@ -1,9 +1,9 @@ var Seq, moment, BaseView, Graph, root, DEBOUNCE_RENDER, GraphView, _; Seq = require('seq'); moment = require('moment'); -_ = require('limn/util/underscore'); -BaseView = require('limn/base').BaseView; -Graph = require('limn/graph/graph-model').Graph; +_ = require('../util/underscore'); +BaseView = require('../base').BaseView; +Graph = require('./graph-model').Graph; root = function(){ return this; }(); diff --git a/lib/graph/graph-view.mod.js b/lib/graph/graph-view.mod.js index baf0165..3c9ed41 100644 --- a/lib/graph/graph-view.mod.js +++ b/lib/graph/graph-view.mod.js @@ -3,9 +3,9 @@ require.define('/node_modules/limn/graph/graph-view.js', function(require, modul var Seq, moment, BaseView, Graph, root, DEBOUNCE_RENDER, GraphView, _; Seq = require('seq'); moment = require('moment'); -_ = require('limn/util/underscore'); -BaseView = require('limn/base').BaseView; -Graph = require('limn/graph/graph-model').Graph; +_ = require('../util/underscore'); +BaseView = require('../base').BaseView; +Graph = require('./graph-model').Graph; root = function(){ return this; }(); diff --git a/lib/graph/index.js b/lib/graph/index.js index 0247b67..342aa3d 100644 --- a/lib/graph/index.js +++ b/lib/graph/index.js @@ -1,9 +1,9 @@ var models, base_views, display_views, edit_views, index_views; -models = require('limn/graph/graph-model'); -base_views = require('limn/graph/graph-view'); -display_views = require('limn/graph/graph-display-view'); -edit_views = require('limn/graph/graph-edit-view'); -index_views = require('limn/graph/graph-list-view'); +models = require('./graph-model'); +base_views = require('./graph-view'); +display_views = require('./graph-display-view'); +edit_views = require('./graph-edit-view'); +index_views = require('./graph-list-view'); __import(__import(__import(__import(__import(exports, models), base_views), display_views), edit_views), index_views); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/graph/index.mod.js b/lib/graph/index.mod.js index 7fb7d8b..bbf94ed 100644 --- a/lib/graph/index.mod.js +++ b/lib/graph/index.mod.js @@ -1,11 +1,11 @@ -require.define('/node_modules/limn/graph.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/graph/index.js', function(require, module, exports, __dirname, __filename, undefined){ var models, base_views, display_views, edit_views, index_views; -models = require('limn/graph/graph-model'); -base_views = require('limn/graph/graph-view'); -display_views = require('limn/graph/graph-display-view'); -edit_views = require('limn/graph/graph-edit-view'); -index_views = require('limn/graph/graph-list-view'); +models = require('./graph-model'); +base_views = require('./graph-view'); +display_views = require('./graph-display-view'); +edit_views = require('./graph-edit-view'); +index_views = require('./graph-list-view'); __import(__import(__import(__import(__import(exports, models), base_views), display_views), edit_views), index_views); function __import(obj, src){ var own = {}.hasOwnProperty; diff --git a/lib/index.js b/lib/index.js new file mode 100644 index 0000000..6164acd --- /dev/null +++ b/lib/index.js @@ -0,0 +1 @@ +module.exports = require('./server/middleware'); \ No newline at end of file diff --git a/lib/limn.js b/lib/limn.js index f887dd0..979a5f9 100644 --- a/lib/limn.js +++ b/lib/limn.js @@ -1,11 +1,11 @@ var limn, Backbone, op, root, BaseView, BaseModel, BaseList, ChartType, DygraphsChartType, Graph, GraphList, GraphDisplayView, GraphEditView, GraphListView, DashboardView, Dashboard, LimnApp, _ref, _; limn = exports; Backbone = require('backbone'); -_ref = limn.util = require('limn/util'), _ = _ref._, op = _ref.op, root = _ref.root; -_ref = limn.base = require('limn/base'), BaseView = _ref.BaseView, BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; -_ref = limn.chart = require('limn/chart'), ChartType = _ref.ChartType, DygraphsChartType = _ref.DygraphsChartType; -_ref = limn.graph = require('limn/graph'), Graph = _ref.Graph, GraphList = _ref.GraphList, GraphDisplayView = _ref.GraphDisplayView, GraphEditView = _ref.GraphEditView, GraphListView = _ref.GraphListView; -_ref = limn.dashboard = require('limn/dashboard'), DashboardView = _ref.DashboardView, Dashboard = _ref.Dashboard; +_ref = limn.util = require('./util'), _ = _ref._, op = _ref.op, root = _ref.root; +_ref = limn.base = require('./base'), BaseView = _ref.BaseView, BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +_ref = limn.chart = require('./chart'), ChartType = _ref.ChartType, DygraphsChartType = _ref.DygraphsChartType; +_ref = limn.graph = require('./graph'), Graph = _ref.Graph, GraphList = _ref.GraphList, GraphDisplayView = _ref.GraphDisplayView, GraphEditView = _ref.GraphEditView, GraphListView = _ref.GraphListView; +_ref = limn.dashboard = require('./dashboard'), DashboardView = _ref.DashboardView, Dashboard = _ref.Dashboard; /** * @class Sets up root application, automatically attaching to an existing element * found at `appSelector` and delegating to the appropriate view. diff --git a/lib/limn.mod.js b/lib/limn.mod.js index a88a916..904f2eb 100644 --- a/lib/limn.mod.js +++ b/lib/limn.mod.js @@ -3,11 +3,11 @@ require.define('/node_modules/limn/limn.js', function(require, module, exports, var limn, Backbone, op, root, BaseView, BaseModel, BaseList, ChartType, DygraphsChartType, Graph, GraphList, GraphDisplayView, GraphEditView, GraphListView, DashboardView, Dashboard, LimnApp, _ref, _; limn = exports; Backbone = require('backbone'); -_ref = limn.util = require('limn/util'), _ = _ref._, op = _ref.op, root = _ref.root; -_ref = limn.base = require('limn/base'), BaseView = _ref.BaseView, BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; -_ref = limn.chart = require('limn/chart'), ChartType = _ref.ChartType, DygraphsChartType = _ref.DygraphsChartType; -_ref = limn.graph = require('limn/graph'), Graph = _ref.Graph, GraphList = _ref.GraphList, GraphDisplayView = _ref.GraphDisplayView, GraphEditView = _ref.GraphEditView, GraphListView = _ref.GraphListView; -_ref = limn.dashboard = require('limn/dashboard'), DashboardView = _ref.DashboardView, Dashboard = _ref.Dashboard; +_ref = limn.util = require('./util'), _ = _ref._, op = _ref.op, root = _ref.root; +_ref = limn.base = require('./base'), BaseView = _ref.BaseView, BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +_ref = limn.chart = require('./chart'), ChartType = _ref.ChartType, DygraphsChartType = _ref.DygraphsChartType; +_ref = limn.graph = require('./graph'), Graph = _ref.Graph, GraphList = _ref.GraphList, GraphDisplayView = _ref.GraphDisplayView, GraphEditView = _ref.GraphEditView, GraphListView = _ref.GraphListView; +_ref = limn.dashboard = require('./dashboard'), DashboardView = _ref.DashboardView, Dashboard = _ref.Dashboard; /** * @class Sets up root application, automatically attaching to an existing element * found at `appSelector` and delegating to the appropriate view. diff --git a/lib/server/files.js b/lib/server/files.js index 766e9c9..9cc5004 100644 --- a/lib/server/files.js +++ b/lib/server/files.js @@ -132,7 +132,7 @@ logErrorsAnd = exports.logErrorsAnd = function(cb){ }; if (require.main === module) { files = exports; - u = require('limn/util/underscore'); + u = require('../util/underscore'); paths = ['package.*', 'deploy.sh']; files.readFilesAsync(paths, function(err, data){ if (err) { diff --git a/lib/server/middleware.js b/lib/server/middleware.js index 4b979ae..96273d8 100644 --- a/lib/server/middleware.js +++ b/lib/server/middleware.js @@ -113,6 +113,11 @@ application = limn.application = { this.BASE = BASE; opts = _.merge({}, DEFAULT_OPTIONS, opts); opx = opts.proxy; + if (typeof opx === 'boolean') { + opx = opts.proxy = { + enabled: opx + }; + } if (opx.enabled === false && (opx.whitelist || opx.blacklist)) { opx.enabled = true; } @@ -136,17 +141,9 @@ application = limn.application = { this.use(express.methodOverride()); return this.use(this.router); }); - this.configure('production', function(){ - this.use(express.logger()); - return this.use(express.errorHandler()); - }); this.configure('development', function(){ var varDir, dataDir, opts, compiler, _ref; opts = (_ref = this.set('limn options'), varDir = _ref.varDir, dataDir = _ref.dataDir, _ref); - this.use(express.errorHandler({ - dumpExceptions: true, - showStack: true - })); this.set('view options').pretty = true; this.use(require('browserify')({ mount: '/vendor/browserify.js', diff --git a/lib/server/server.js b/lib/server/server.js index 19bd503..9b65e75 100644 --- a/lib/server/server.js +++ b/lib/server/server.js @@ -20,6 +20,10 @@ app.use(limn = app.limn = LimnMiddleware({ whitelist: /.*/ } })); +app.use(express.errorHandler({ + dumpExceptions: true, + showStack: true +})); /** * Handle webhook notification to pull from origin. */ diff --git a/lib/server/view-helpers.js b/lib/server/view-helpers.js index 13a4874..f24d8f8 100644 --- a/lib/server/view-helpers.js +++ b/lib/server/view-helpers.js @@ -1,15 +1,16 @@ -var CWD, WWW, VAR, STATIC, VERSION, fs, path, yaml, jade, NODE_ENV, IS_PROD, IS_TEST, IS_DEV, SOURCES_ENV, sources, joinTree, _; -CWD = exports.CWD = process.cwd(); -WWW = exports.WWW = CWD + "/www"; -VAR = exports.VAR = CWD + "/var"; -STATIC = exports.STATIC = CWD + "/static"; +var fs, path, dirname, BASE, WWW, VAR, STATIC, VERSION, yaml, jade, NODE_ENV, IS_PROD, IS_TEST, IS_DEV, SOURCES_ENV, sources, joinTree, _; +fs = exports.fs = require('fs'); +path = exports.path = require('path'); +dirname = path.dirname; +BASE = exports.BASE = dirname(dirname(__dirname)); +WWW = exports.WWW = BASE + "/www"; +VAR = exports.VAR = BASE + "/var"; +STATIC = exports.STATIC = BASE + "/static"; VERSION = 'HEAD'; try { VERSION = require('../version'); } catch (e) {} exports.VERSION = exports.version = VERSION; -fs = exports.fs = require('fs'); -path = exports.path = require('path'); _ = exports._ = require('underscore'); _.str = require('underscore.string'); _.mixin(_.str.exports()); diff --git a/lib/util/aliasdict.js b/lib/util/aliasdict.js index 2b02298..e3ddad3 100644 --- a/lib/util/aliasdict.js +++ b/lib/util/aliasdict.js @@ -1,5 +1,5 @@ var AliasDict, exports, _, __slice = [].slice; -_ = require('limn/util/underscore'); +_ = require('./underscore'); /** * @class A mapping of key-value pairs supporting key-aliases. */ diff --git a/lib/util/cascade.js b/lib/util/cascade.js index 608f6e8..c06ad40 100644 --- a/lib/util/cascade.js +++ b/lib/util/cascade.js @@ -1,5 +1,5 @@ var hasOwn, MISSING, TOMBSTONE, Cascade, ALIASES, dest, src, exports, _, __slice = [].slice; -_ = require('limn/util/underscore'); +_ = require('./underscore'); hasOwn = {}.hasOwnProperty; /** * Sentinel for missing values. diff --git a/lib/util/cascade.mod.js b/lib/util/cascade.mod.js index 41e7c1d..b4fb998 100644 --- a/lib/util/cascade.mod.js +++ b/lib/util/cascade.mod.js @@ -1,7 +1,7 @@ require.define('/node_modules/limn/util/cascade.js', function(require, module, exports, __dirname, __filename, undefined){ var hasOwn, MISSING, TOMBSTONE, Cascade, ALIASES, dest, src, exports, _, __slice = [].slice; -_ = require('limn/util/underscore'); +_ = require('./underscore'); hasOwn = {}.hasOwnProperty; /** * Sentinel for missing values. diff --git a/lib/util/event/index.js b/lib/util/event/index.js index a4a7138..65b9e63 100644 --- a/lib/util/event/index.js +++ b/lib/util/event/index.js @@ -1,2 +1,2 @@ -exports.WaitingEmitter = require('limn/util/event/waiting-emitter'); -exports.ReadyEmitter = require('limn/util/event/ready-emitter'); \ No newline at end of file +exports.WaitingEmitter = require('./waiting-emitter'); +exports.ReadyEmitter = require('./ready-emitter'); \ No newline at end of file diff --git a/lib/util/event/index.mod.js b/lib/util/event/index.mod.js index 20b7b19..ad30b39 100644 --- a/lib/util/event/index.mod.js +++ b/lib/util/event/index.mod.js @@ -1,6 +1,6 @@ -require.define('/node_modules/limn/util/event.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/util/event/index.js', function(require, module, exports, __dirname, __filename, undefined){ -exports.WaitingEmitter = require('limn/util/event/waiting-emitter'); -exports.ReadyEmitter = require('limn/util/event/ready-emitter'); +exports.WaitingEmitter = require('./waiting-emitter'); +exports.ReadyEmitter = require('./ready-emitter'); }); diff --git a/lib/util/event/ready-emitter.js b/lib/util/event/ready-emitter.js index e668e52..6f47b15 100644 --- a/lib/util/event/ready-emitter.js +++ b/lib/util/event/ready-emitter.js @@ -1,5 +1,5 @@ var Base, ReadyEmitter, exports; -Base = require('limn/base/base'); +Base = require('../../base/base'); /** * @class An EventEmitter that auto-triggers new handlers once "ready". */ diff --git a/lib/util/event/ready-emitter.mod.js b/lib/util/event/ready-emitter.mod.js index 203d7ce..9b23db1 100644 --- a/lib/util/event/ready-emitter.mod.js +++ b/lib/util/event/ready-emitter.mod.js @@ -1,7 +1,7 @@ require.define('/node_modules/limn/util/event/ready-emitter.js', function(require, module, exports, __dirname, __filename, undefined){ var Base, ReadyEmitter, exports; -Base = require('limn/base/base'); +Base = require('../../base/base'); /** * @class An EventEmitter that auto-triggers new handlers once "ready". */ diff --git a/lib/util/event/waiting-emitter.js b/lib/util/event/waiting-emitter.js index f996005..b526fb0 100644 --- a/lib/util/event/waiting-emitter.js +++ b/lib/util/event/waiting-emitter.js @@ -1,5 +1,5 @@ var Base, WaitingEmitter, exports; -Base = require('limn/base/base'); +Base = require('../../base/base'); /** * @class An EventEmitter with a ratchet-up waiting counter. * @extends Base diff --git a/lib/util/event/waiting-emitter.mod.js b/lib/util/event/waiting-emitter.mod.js index 5665b8b..8dd0af8 100644 --- a/lib/util/event/waiting-emitter.mod.js +++ b/lib/util/event/waiting-emitter.mod.js @@ -1,7 +1,7 @@ require.define('/node_modules/limn/util/event/waiting-emitter.js', function(require, module, exports, __dirname, __filename, undefined){ var Base, WaitingEmitter, exports; -Base = require('limn/base/base'); +Base = require('../../base/base'); /** * @class An EventEmitter with a ratchet-up waiting counter. * @extends Base diff --git a/lib/util/formatters.js b/lib/util/formatters.js index 15fec32..74dac32 100644 --- a/lib/util/formatters.js +++ b/lib/util/formatters.js @@ -1,6 +1,6 @@ var moment, op, exports, _ref, _, _fmt; moment = require('moment'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('../util'), _ = _ref._, op = _ref.op; _fmt = { /** * Formats a date for display on an axis: `MM/YYYY` diff --git a/lib/util/formatters.mod.js b/lib/util/formatters.mod.js index c9c1605..7b2d525 100644 --- a/lib/util/formatters.mod.js +++ b/lib/util/formatters.mod.js @@ -2,7 +2,7 @@ require.define('/node_modules/limn/util/formatters.js', function(require, module var moment, op, exports, _ref, _, _fmt; moment = require('moment'); -_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('../util'), _ = _ref._, op = _ref.op; _fmt = { /** * Formats a date for display on an axis: `MM/YYYY` diff --git a/lib/util/index.js b/lib/util/index.js index c2a4c29..8185164 100644 --- a/lib/util/index.js +++ b/lib/util/index.js @@ -1,6 +1,6 @@ var op, root, backbone, parser, Cascade, _, _ref, __slice = [].slice; -_ = exports._ = require('limn/util/underscore'); -op = exports.op = require('limn/util/op'); +_ = exports._ = require('./underscore'); +op = exports.op = require('./op'); root = exports.root = function(){ return this; }(); @@ -32,10 +32,10 @@ if ((_ref = root.jQuery) != null) { return _results; }; } -__import(exports, require('limn/util/event')); -backbone = exports.backbone = require('limn/util/backbone'); -parser = exports.parser = require('limn/util/parser'); -Cascade = exports.Cascade = require('limn/util/cascade'); +__import(exports, require('./event')); +backbone = exports.backbone = require('./backbone'); +parser = exports.parser = require('./parser'); +Cascade = exports.Cascade = require('./cascade'); function __import(obj, src){ var own = {}.hasOwnProperty; for (var key in src) if (own.call(src, key)) obj[key] = src[key]; diff --git a/lib/util/index.mod.js b/lib/util/index.mod.js index 40a8bbe..7c5fe4b 100644 --- a/lib/util/index.mod.js +++ b/lib/util/index.mod.js @@ -1,8 +1,8 @@ -require.define('/node_modules/limn/util.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/util/index.js', function(require, module, exports, __dirname, __filename, undefined){ var op, root, backbone, parser, Cascade, _, _ref, __slice = [].slice; -_ = exports._ = require('limn/util/underscore'); -op = exports.op = require('limn/util/op'); +_ = exports._ = require('./underscore'); +op = exports.op = require('./op'); root = exports.root = function(){ return this; }(); @@ -34,10 +34,10 @@ if ((_ref = root.jQuery) != null) { return _results; }; } -__import(exports, require('limn/util/event')); -backbone = exports.backbone = require('limn/util/backbone'); -parser = exports.parser = require('limn/util/parser'); -Cascade = exports.Cascade = require('limn/util/cascade'); +__import(exports, require('./event')); +backbone = exports.backbone = require('./backbone'); +parser = exports.parser = require('./parser'); +Cascade = exports.Cascade = require('./cascade'); function __import(obj, src){ var own = {}.hasOwnProperty; for (var key in src) if (own.call(src, key)) obj[key] = src[key]; diff --git a/lib/util/op.js b/lib/util/op.js index 7bb2e07..26a4d66 100644 --- a/lib/util/op.js +++ b/lib/util/op.js @@ -1,20 +1,13 @@ -var DASH_PATTERN, STRIP_PAT, strip, FALSEY, parseBool, op, __slice = [].slice; +var DASH_PATTERN, STRIP_PAT, FALSEY, parseBool, op, __slice = [].slice; DASH_PATTERN = /-/g; STRIP_PAT = /(^\s*|\s*$)/g; -strip = function(s){ - if (s) { - return s.replace(STRIP_PAT, ''); - } else { - return s; - } -}; FALSEY = /^\s*(?:no|off|false)\s*$/i; parseBool = function(s){ var i; i = parseInt(s || 0); return !!(isNaN(i) ? !FALSEY.test(s) : i); }; -module.exports = op = { +op = { I: function(x){ return x; }, @@ -164,7 +157,7 @@ module.exports = op = { return new RegExp(v); }, toObject: function(v){ - if (typeof v === 'string' && strip(v)) { + if (typeof v === 'string' && op.strip(v)) { return JSON.parse(v); } else { return v; @@ -287,5 +280,18 @@ module.exports = op = { decode: function(it){ return it && $("
" + it + "
").text(); }, - strip: strip -}; \ No newline at end of file + strip: function(s){ + if (s) { + return s.replace(STRIP_PAT, ''); + } else { + return s; + } + } +}; +if (typeof module != 'undefined' && module !== null) { + if (typeof module != 'undefined' && module !== null) { + module.exports = op; + } +} else if (typeof window != 'undefined' && window !== null) { + window.op = op; +} \ No newline at end of file diff --git a/lib/util/op.mod.js b/lib/util/op.mod.js index da80201..1326859 100644 --- a/lib/util/op.mod.js +++ b/lib/util/op.mod.js @@ -1,22 +1,15 @@ require.define('/node_modules/limn/util/op.js', function(require, module, exports, __dirname, __filename, undefined){ -var DASH_PATTERN, STRIP_PAT, strip, FALSEY, parseBool, op, __slice = [].slice; +var DASH_PATTERN, STRIP_PAT, FALSEY, parseBool, op, __slice = [].slice; DASH_PATTERN = /-/g; STRIP_PAT = /(^\s*|\s*$)/g; -strip = function(s){ - if (s) { - return s.replace(STRIP_PAT, ''); - } else { - return s; - } -}; FALSEY = /^\s*(?:no|off|false)\s*$/i; parseBool = function(s){ var i; i = parseInt(s || 0); return !!(isNaN(i) ? !FALSEY.test(s) : i); }; -module.exports = op = { +op = { I: function(x){ return x; }, @@ -166,7 +159,7 @@ module.exports = op = { return new RegExp(v); }, toObject: function(v){ - if (typeof v === 'string' && strip(v)) { + if (typeof v === 'string' && op.strip(v)) { return JSON.parse(v); } else { return v; @@ -289,7 +282,20 @@ module.exports = op = { decode: function(it){ return it && $("
" + it + "
").text(); }, - strip: strip + strip: function(s){ + if (s) { + return s.replace(STRIP_PAT, ''); + } else { + return s; + } + } }; +if (typeof module != 'undefined' && module !== null) { + if (typeof module != 'undefined' && module !== null) { + module.exports = op; + } +} else if (typeof window != 'undefined' && window !== null) { + window.op = op; +} }); diff --git a/lib/util/parser.js b/lib/util/parser.js index 9022a3e..e2fa110 100644 --- a/lib/util/parser.js +++ b/lib/util/parser.js @@ -1,7 +1,7 @@ var op, BaseModel, BaseList, BaseView, Mixin, Parsers, ParserMixin, ParsingModel, ParsingList, ParsingView, _, _ref; -_ = require('limn/util/underscore'); -op = require('limn/util/op'); -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView, Mixin = _ref.Mixin; +_ = require('./underscore'); +op = require('./op'); +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView, Mixin = _ref.Mixin; /** * @namespace Parsers by type. */ diff --git a/lib/util/parser.mod.js b/lib/util/parser.mod.js index d5e191d..a6dda3c 100644 --- a/lib/util/parser.mod.js +++ b/lib/util/parser.mod.js @@ -1,9 +1,9 @@ require.define('/node_modules/limn/util/parser.js', function(require, module, exports, __dirname, __filename, undefined){ var op, BaseModel, BaseList, BaseView, Mixin, Parsers, ParserMixin, ParsingModel, ParsingList, ParsingView, _, _ref; -_ = require('limn/util/underscore'); -op = require('limn/util/op'); -_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView, Mixin = _ref.Mixin; +_ = require('./underscore'); +op = require('./op'); +_ref = require('../base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView, Mixin = _ref.Mixin; /** * @namespace Parsers by type. */ diff --git a/lib/util/timeseries/csv.js b/lib/util/timeseries/csv.js index af0d34b..ef8f7e6 100644 --- a/lib/util/timeseries/csv.js +++ b/lib/util/timeseries/csv.js @@ -1,6 +1,6 @@ var TimeSeriesData, DASH_PATTERN, BLANK_LINE_PATTERN, COMMENT_PATTERN, CSVData, exports, _; -_ = require('limn/util/underscore'); -TimeSeriesData = require('limn/util/timeseries/timeseries'); +_ = require('../underscore'); +TimeSeriesData = require('./timeseries'); DASH_PATTERN = /-/g; BLANK_LINE_PATTERN = /^(\s*)$/; COMMENT_PATTERN = /\s*(#|\/\/).*$/; diff --git a/lib/util/timeseries/csv.mod.js b/lib/util/timeseries/csv.mod.js index c370061..bc76bde 100644 --- a/lib/util/timeseries/csv.mod.js +++ b/lib/util/timeseries/csv.mod.js @@ -1,8 +1,8 @@ require.define('/node_modules/limn/util/timeseries/csv.js', function(require, module, exports, __dirname, __filename, undefined){ var TimeSeriesData, DASH_PATTERN, BLANK_LINE_PATTERN, COMMENT_PATTERN, CSVData, exports, _; -_ = require('limn/util/underscore'); -TimeSeriesData = require('limn/util/timeseries/timeseries'); +_ = require('../underscore'); +TimeSeriesData = require('./timeseries'); DASH_PATTERN = /-/g; BLANK_LINE_PATTERN = /^(\s*)$/; COMMENT_PATTERN = /\s*(#|\/\/).*$/; diff --git a/lib/util/timeseries/index.js b/lib/util/timeseries/index.js index 862a85d..fac82fc 100644 --- a/lib/util/timeseries/index.js +++ b/lib/util/timeseries/index.js @@ -1,2 +1,2 @@ -exports.TimeSeriesData = require('limn/util/timeseries/timeseries'); -exports.CSVData = require('limn/util/timeseries/csv'); \ No newline at end of file +exports.TimeSeriesData = require('./timeseries'); +exports.CSVData = require('./csv'); \ No newline at end of file diff --git a/lib/util/timeseries/index.mod.js b/lib/util/timeseries/index.mod.js index 59bd841..1359857 100644 --- a/lib/util/timeseries/index.mod.js +++ b/lib/util/timeseries/index.mod.js @@ -1,6 +1,6 @@ -require.define('/node_modules/limn/util/timeseries.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/util/timeseries/index.js', function(require, module, exports, __dirname, __filename, undefined){ -exports.TimeSeriesData = require('limn/util/timeseries/timeseries'); -exports.CSVData = require('limn/util/timeseries/csv'); +exports.TimeSeriesData = require('./timeseries'); +exports.CSVData = require('./csv'); }); diff --git a/lib/util/timeseries/timeseries.js b/lib/util/timeseries/timeseries.js index 75cf26f..53a430a 100644 --- a/lib/util/timeseries/timeseries.js +++ b/lib/util/timeseries/timeseries.js @@ -1,5 +1,5 @@ var TimeSeriesData, exports, _; -_ = require('limn/util/underscore'); +_ = require('../underscore'); /** * @class Represents a collection of data columns aligned along a common timeline. */ diff --git a/lib/util/timeseries/timeseries.mod.js b/lib/util/timeseries/timeseries.mod.js index 4e2fb78..a0af78f 100644 --- a/lib/util/timeseries/timeseries.mod.js +++ b/lib/util/timeseries/timeseries.mod.js @@ -1,7 +1,7 @@ require.define('/node_modules/limn/util/timeseries/timeseries.js', function(require, module, exports, __dirname, __filename, undefined){ var TimeSeriesData, exports, _; -_ = require('limn/util/underscore'); +_ = require('../underscore'); /** * @class Represents a collection of data columns aligned along a common timeline. */ diff --git a/lib/util/underscore/index.js b/lib/util/underscore/index.js index 7d0a93b..2c9b7ed 100644 --- a/lib/util/underscore/index.js +++ b/lib/util/underscore/index.js @@ -2,12 +2,12 @@ var exports, _; _ = require('underscore'); _.str = require('underscore.string'); _.mixin(_.str.exports()); -_.mixin(require('limn/util/underscore/function')); -_.mixin(require('limn/util/underscore/array')); -_.mixin(require('limn/util/underscore/object')); -_.mixin(require('limn/util/underscore/class')); -_.mixin(require('limn/util/underscore/kv')); -_.mixin(require('limn/util/underscore/string')); +_.mixin(require('./function')); +_.mixin(require('./array')); +_.mixin(require('./object')); +_.mixin(require('./class')); +_.mixin(require('./kv')); +_.mixin(require('./string')); _.dump = function(o, label, expanded){ var k, v; label == null && (label = 'dump'); diff --git a/lib/util/underscore/index.mod.js b/lib/util/underscore/index.mod.js index 10ccd40..9cba1e4 100644 --- a/lib/util/underscore/index.mod.js +++ b/lib/util/underscore/index.mod.js @@ -1,15 +1,15 @@ -require.define('/node_modules/limn/util/underscore.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/util/underscore/index.js', function(require, module, exports, __dirname, __filename, undefined){ var exports, _; _ = require('underscore'); _.str = require('underscore.string'); _.mixin(_.str.exports()); -_.mixin(require('limn/util/underscore/function')); -_.mixin(require('limn/util/underscore/array')); -_.mixin(require('limn/util/underscore/object')); -_.mixin(require('limn/util/underscore/class')); -_.mixin(require('limn/util/underscore/kv')); -_.mixin(require('limn/util/underscore/string')); +_.mixin(require('./function')); +_.mixin(require('./array')); +_.mixin(require('./object')); +_.mixin(require('./class')); +_.mixin(require('./kv')); +_.mixin(require('./string')); _.dump = function(o, label, expanded){ var k, v; label == null && (label = 'dump'); diff --git a/package.co b/package.co index e66f2d6..5762feb 100644 --- a/package.co +++ b/package.co @@ -4,15 +4,13 @@ description : 'A GUI Visualization Toolkit' homepage : 'https://github.com/wikimedia/limn' keywords : <[ visualization graph gui d3 ]> author : 'David Schoonover (http://less.ly)' -contributors : [ - 'Andrew Otto ' - 'Fabian Kaelin ' - 'Evan Rosen ' - 'Diederik van Liere ' -] +contributors : + 'Andrew Otto ' + 'Fabian Kaelin ' + 'Evan Rosen ' + 'Diederik van Liere ' - -# main : './lib' +main : './lib/server/middleware' # directories : lib: './lib', bin:'./bin', doc:'./doc', man:'./man' dependencies : diff --git a/package.json b/package.json index b3474fa..5a7bcb5 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "Evan Rosen ", "Diederik van Liere " ], + "main": "./lib/server/middleware", "dependencies": { "d3": "== 2.9.x", "underscore": "== 1.3.x", diff --git a/src/app.co b/src/app.co index 050341a..90a760f 100644 --- a/src/app.co +++ b/src/app.co @@ -1,7 +1,7 @@ Backbone = require 'backbone' { _, op, -} = require 'limn/util' +} = require './util' /** diff --git a/src/base/asset-manager.co b/src/base/asset-manager.co index ff646a1..e2abc04 100644 --- a/src/base/asset-manager.co +++ b/src/base/asset-manager.co @@ -1,7 +1,7 @@ { _, op, -} = require 'limn/util' +} = require '../util' { ReadyEmitter, -} = require 'limn/util/event' +} = require '../util/event' diff --git a/src/base/base-mixin.co b/src/base/base-mixin.co index 5e6af11..ac5f95e 100644 --- a/src/base/base-mixin.co +++ b/src/base/base-mixin.co @@ -1,7 +1,7 @@ Backbone = require 'backbone' { _, op, -} = require 'limn/util' +} = require '../util' diff --git a/src/base/base-model.co b/src/base/base-model.co index 68ed48d..7219b6a 100644 --- a/src/base/base-model.co +++ b/src/base/base-model.co @@ -1,9 +1,9 @@ Backbone = require 'backbone' { _, op, -} = require 'limn/util' +} = require '../util' { BaseBackboneMixin, mixinBase, -} = require 'limn/base/base-mixin' +} = require './base-mixin' diff --git a/src/base/base-view.co b/src/base/base-view.co index c214d13..77ebad8 100644 --- a/src/base/base-view.co +++ b/src/base/base-view.co @@ -1,13 +1,13 @@ Backbone = require 'backbone' { _, op, -} = require 'limn/util' -{ BaseBackboneMixin, mixinBase, -} = require 'limn/base/base-mixin' +} = require '../util' +{ mixinBase, +} = require './base-mixin' { BaseModel, -} = require 'limn/base/base-mixin' +} = require './base-model' { DataBinding, -} = require 'limn/base/data-binding' +} = require './data-binding' diff --git a/src/base/base.co b/src/base/base.co index 4591cd0..5224bca 100644 --- a/src/base/base.co +++ b/src/base/base.co @@ -3,7 +3,7 @@ EventEmitter::off = EventEmitter::removeListener EventEmitter::trigger = EventEmitter::emit { _, op -} = require 'limn/util' +} = require '../util' diff --git a/src/base/cascading-model.co b/src/base/cascading-model.co index d232593..f5ff9f7 100644 --- a/src/base/cascading-model.co +++ b/src/base/cascading-model.co @@ -1,9 +1,9 @@ { _, op, -} = require 'limn/util' +} = require '../util' { BaseModel, BaseList, -} = require 'limn/base/base-model' +} = require './base-model' -Cascade = require 'limn/util/cascade' +Cascade = require '../util/cascade' diff --git a/src/base/data-binding.co b/src/base/data-binding.co index b130f85..30b493f 100644 --- a/src/base/data-binding.co +++ b/src/base/data-binding.co @@ -1,7 +1,7 @@ Backbone = require 'backbone' { _, op, -} = require 'limn/util' +} = require '../util' class exports.DataBinding diff --git a/src/base/index.co b/src/base/index.co index cfeab93..4a62daf 100644 --- a/src/base/index.co +++ b/src/base/index.co @@ -1,9 +1,9 @@ -exports.Base = require 'limn/base/base' -mixins = require 'limn/base/base-mixin' -models = require 'limn/base/base-model' -views = require 'limn/base/base-view' -cache = require 'limn/base/model-cache' -cascading = require 'limn/base/cascading-model' -data_binding = require 'limn/base/data-binding' +exports.Base = require './base' +mixins = require './base-mixin' +models = require './base-model' +views = require './base-view' +cache = require './model-cache' +cascading = require './cascading-model' +data_binding = require './data-binding' exports import mixins import models import views \ import cache import cascading import data_binding diff --git a/src/base/model-cache.co b/src/base/model-cache.co index 177ebce..91abb80 100644 --- a/src/base/model-cache.co +++ b/src/base/model-cache.co @@ -1,7 +1,7 @@ _ = require 'underscore' Seq = require 'seq' -{ReadyEmitter} = require 'limn/util/event' +{ReadyEmitter} = require '../util/event' # TODO: Bubble events to decorated emitters diff --git a/src/base/resource-router.co b/src/base/resource-router.co index f5ce9da..1354472 100644 --- a/src/base/resource-router.co +++ b/src/base/resource-router.co @@ -1,9 +1,9 @@ Backbone = require 'backbone' { _, op, -} = require 'limn/util' +} = require '../util' { BaseBackboneMixin, mixinBase, -} = require 'limn/base/base-mixin' +} = require './base-mixin' diff --git a/src/base/scaffold/index.co b/src/base/scaffold/index.co index 9e23fe2..5298a72 100644 --- a/src/base/scaffold/index.co +++ b/src/base/scaffold/index.co @@ -1,3 +1,3 @@ -models = require 'limn/base/scaffold/scaffold-model' -views = require 'limn/base/scaffold/scaffold-view' +models = require './scaffold-model' +views = require './scaffold-view' exports import models import views diff --git a/src/base/scaffold/scaffold-model.co b/src/base/scaffold/scaffold-model.co index e8ca6da..7e94a1b 100644 --- a/src/base/scaffold/scaffold-model.co +++ b/src/base/scaffold/scaffold-model.co @@ -1,7 +1,7 @@ -_ = require 'limn/util/underscore' -op = require 'limn/util/op' +{ _, op, +} = require '../util' { BaseModel, BaseList, -} = require 'limn/base' +} = require '../../base' diff --git a/src/base/scaffold/scaffold-view.co b/src/base/scaffold/scaffold-view.co index 075054d..817f8f2 100644 --- a/src/base/scaffold/scaffold-view.co +++ b/src/base/scaffold/scaffold-view.co @@ -1,9 +1,9 @@ -_ = require 'limn/util/underscore' -op = require 'limn/util/op' +{ _, op, +} = require '../../util' { BaseView, -} = require 'limn/base' +} = require '../../base' { Field, FieldList, -} = require 'limn/base/scaffold/scaffold-model' +} = require './scaffold-model' FieldView = exports.FieldView = BaseView.extend do # {{{ diff --git a/src/chart/chart-type.co b/src/chart/chart-type.co index 1ea7f85..adbfc92 100644 --- a/src/chart/chart-type.co +++ b/src/chart/chart-type.co @@ -2,11 +2,11 @@ moment = require 'moment' Backbone = require 'backbone' { _, op, -} = require 'limn/util' +} = require '../util' { ReadyEmitter, -} = require 'limn/util/event' +} = require '../util/event' { Parsers, ParserMixin, -} = require 'limn/util/parser' +} = require '../util/parser' diff --git a/src/chart/index.co b/src/chart/index.co index 3a2fd85..ef3f3b5 100644 --- a/src/chart/index.co +++ b/src/chart/index.co @@ -1,8 +1,8 @@ -chart_type = require 'limn/chart/chart-type' -chart_option = require 'limn/chart/option' -dygraphs = require 'limn/chart/type/dygraphs' -d3_chart = require 'limn/chart/type/d3-chart' -d3_elements = require 'limn/chart/type/d3' +chart_type = require './chart-type' +chart_option = require './option' +dygraphs = require './type/dygraphs' +d3_chart = require './type/d3-chart' +d3_elements = require './type/d3' exports import chart_type import chart_option \ import dygraphs import d3_chart import d3_elements diff --git a/src/chart/option/chart-option-model.co b/src/chart/option/chart-option-model.co index 489c775..458133b 100644 --- a/src/chart/option/chart-option-model.co +++ b/src/chart/option/chart-option-model.co @@ -1,9 +1,9 @@ { _, op, -} = require 'limn/util' +} = require '../../util' { Parsers, ParserMixin, ParsingModel, ParsingView, -} = require 'limn/util/parser' +} = require '../../util/parser' { BaseModel, BaseList, -} = require 'limn/base' +} = require '../../base' /** diff --git a/src/chart/option/chart-option-view.co b/src/chart/option/chart-option-view.co index 3b0fab5..feecdad 100644 --- a/src/chart/option/chart-option-view.co +++ b/src/chart/option/chart-option-view.co @@ -1,9 +1,9 @@ { _, op, -} = require 'limn/util' +} = require '../../util' { BaseView, -} = require 'limn/base' +} = require '../../base' { ChartOption, ChartOptionList, -} = require 'limn/chart/option/chart-option-model' +} = require './chart-option-model' DEBOUNCE_RENDER = exports.DEBOUNCE_RENDER = 100ms @@ -14,7 +14,7 @@ DEBOUNCE_RENDER = exports.DEBOUNCE_RENDER = 100ms ChartOptionView = exports.ChartOptionView = BaseView.extend do # {{{ tagName : 'section' className : 'chart-option field' - template : require 'limn/template/chart/chart-option' + template : require '../../template/chart/chart-option' type : 'string' isCollapsed : true @@ -129,7 +129,7 @@ ChartOptionScaffold = exports.ChartOptionScaffold = BaseView.extend do # {{{ __bind__ : <[ addField ]> tagName : 'form' className : 'chart-options scaffold' - template : require 'limn/template/chart/chart-scaffold' + template : require '../../template/chart/chart-scaffold' collectionType : ChartOptionList subviewType : ChartOptionView diff --git a/src/chart/option/index.co b/src/chart/option/index.co index 3244f1c..577390a 100644 --- a/src/chart/option/index.co +++ b/src/chart/option/index.co @@ -1,4 +1,4 @@ -model = require 'limn/chart/option/chart-option-model' -view = require 'limn/chart/option/chart-option-view' +model = require './chart-option-model' +view = require './chart-option-view' exports import model import view diff --git a/src/chart/type/d3-chart.co b/src/chart/type/d3-chart.co index 32e61fc..9f0e321 100644 --- a/src/chart/type/d3-chart.co +++ b/src/chart/type/d3-chart.co @@ -2,11 +2,11 @@ d3 = require 'd3' ColorBrewer = require 'colorbrewer' { _, op, -} = require 'limn/util' +} = require '../../../util' { ChartType, -} = require 'limn/chart/chart-type' +} = require '../../chart-type' { D3ChartElement, -} = require 'limn/chart/type/d3/d3-chart-element' +} = require './d3-chart-element' root = do -> this diff --git a/src/chart/type/d3/d3-bar-chart-type.co b/src/chart/type/d3/d3-bar-chart-type.co index be02f69..68bc30e 100644 --- a/src/chart/type/d3/d3-bar-chart-type.co +++ b/src/chart/type/d3/d3-bar-chart-type.co @@ -1,9 +1,9 @@ d3 = require 'd3' { _, op, -} = require 'limn/util' +} = require '../../../util' { ChartType, -} = require 'limn/chart/chart-type' +} = require '../../chart-type' root = do -> this diff --git a/src/chart/type/d3/d3-bar-element.co b/src/chart/type/d3/d3-bar-element.co index 99c9719..2c15dee 100644 --- a/src/chart/type/d3/d3-bar-element.co +++ b/src/chart/type/d3/d3-bar-element.co @@ -1,11 +1,11 @@ d3 = require 'd3' { _, op, -} = require 'limn/util' +} = require '../../../util' { D3ChartElement -} = require 'limn/chart/type/d3/d3-chart-element' +} = require './d3-chart-element' -_fmt = require 'limn/util/formatters' +_fmt = require '../../../util/formatters' root = do -> this diff --git a/src/chart/type/d3/d3-chart-element.co b/src/chart/type/d3/d3-chart-element.co index e852476..528cc9b 100644 --- a/src/chart/type/d3/d3-chart-element.co +++ b/src/chart/type/d3/d3-chart-element.co @@ -2,10 +2,9 @@ d3 = require 'd3' ColorBrewer = require 'colorbrewer' { _, op, -} = require 'limn/util' +} = require '../../../util' { ReadyEmitter, -} = require 'limn/util/event' -# Base = require 'limn/base/base' +} = require '../../../util/event' root = do -> this diff --git a/src/chart/type/d3/d3-geo-element.co b/src/chart/type/d3/d3-geo-element.co index c690a88..d0827ee 100644 --- a/src/chart/type/d3/d3-geo-element.co +++ b/src/chart/type/d3/d3-geo-element.co @@ -1,9 +1,9 @@ ColorBrewer = require 'colorbrewer' { _, op, -} = require 'limn/util' +} = require '../../../util' { ChartType, -} = require 'limn/chart/chart-type' +} = require '../../chart-type' diff --git a/src/chart/type/d3/d3-line-element.co b/src/chart/type/d3/d3-line-element.co index 92bf946..94a9fbc 100644 --- a/src/chart/type/d3/d3-line-element.co +++ b/src/chart/type/d3/d3-line-element.co @@ -2,11 +2,11 @@ d3 = require 'd3' ColorBrewer = require 'colorbrewer' { _, op, -} = require 'limn/util' +} = require '../../../util' { D3ChartElement -} = require 'limn/chart/type/d3/d3-chart-element' +} = require './d3-chart-element' -_fmt = require 'limn/util/formatters' +_fmt = require '../../../util/formatters' root = do -> this diff --git a/src/chart/type/d3/index.co b/src/chart/type/d3/index.co index 856a7f8..4d39ba8 100644 --- a/src/chart/type/d3/index.co +++ b/src/chart/type/d3/index.co @@ -1,6 +1,6 @@ -d3chart = require 'limn/chart/type/d3/d3-chart-element' -line = require 'limn/chart/type/d3/d3-line-element' -bar = require 'limn/chart/type/d3/d3-bar-element' -# geo = require 'limn/chart/type/d3/d3-geo-element' +d3chart = require './d3-chart-element' +line = require './d3-line-element' +bar = require './d3-bar-element' +# geo = require './d3-geo-element' exports import line import bar import d3chart # import geo diff --git a/src/chart/type/dygraphs.co b/src/chart/type/dygraphs.co index 2266a37..00a0bcd 100644 --- a/src/chart/type/dygraphs.co +++ b/src/chart/type/dygraphs.co @@ -1,6 +1,6 @@ -_ = require 'limn/util/underscore' +_ = require '../../../util/underscore' { ChartType, -} = require 'limn/chart/chart-type' +} = require '../../chart-type' class exports.DygraphsChartType extends ChartType diff --git a/src/dashboard/dashboard-model.co b/src/dashboard/dashboard-model.co index 780417d..80e096e 100644 --- a/src/dashboard/dashboard-model.co +++ b/src/dashboard/dashboard-model.co @@ -1,11 +1,11 @@ Seq = require 'seq' { _, op, -} = require 'limn/util' +} = require '../util' { BaseModel, -} = require 'limn/base' +} = require '../base' { Graph, GraphList, -} = require 'limn/graph/graph-model' +} = require '../graph/graph-model' /** diff --git a/src/dashboard/dashboard-view.co b/src/dashboard/dashboard-view.co index 6f9aea8..642b34a 100644 --- a/src/dashboard/dashboard-view.co +++ b/src/dashboard/dashboard-view.co @@ -1,13 +1,13 @@ Seq = require 'seq' { _, op, -} = require 'limn/util' +} = require '../util' { BaseModel, BaseView, -} = require 'limn/base' +} = require '../base' { Graph, GraphList, GraphDisplayView, -} = require 'limn/graph' +} = require '../graph' { Dashboard, -} = require 'limn/dashboard/dashboard-model' +} = require './dashboard-model' /** @@ -17,7 +17,7 @@ DashboardView = exports.DashboardView = BaseView.extend do # {{{ __bind__ : <[ addTab ]> tagName : 'section' className : 'dashboard' - template : require 'limn/template/dashboard/dashboard' + template : require '../template/dashboard/dashboard' events: @@ -147,7 +147,7 @@ DashboardTabView = exports.DashboardTabView = BaseView.extend do # {{{ __bind__ : <[ ]> className : 'tab-pane' tag : 'div' - template : require 'limn/template/dashboard/dashboard-tab' + template : require '../template/dashboard/dashboard-tab' constructor: function DashboardTabView diff --git a/src/dashboard/index.co b/src/dashboard/index.co index 5f2f229..b98796f 100644 --- a/src/dashboard/index.co +++ b/src/dashboard/index.co @@ -1,3 +1,3 @@ -models = require 'limn/dashboard/dashboard-model' -views = require 'limn/dashboard/dashboard-view' +models = require './dashboard-model' +views = require './dashboard-view' exports import models import views diff --git a/src/data/data-view.co b/src/data/data-view.co index a692f6f..9f552c5 100644 --- a/src/data/data-view.co +++ b/src/data/data-view.co @@ -1,14 +1,14 @@ Seq = require 'seq' { _, op, -} = require 'limn/util' +} = require '../util' { BaseView, ViewList, -} = require 'limn/base' +} = require '../base' { DataSetView, -} = require 'limn/data/dataset-view' +} = require './dataset-view' { MetricEditView, -} = require 'limn/data/metric-edit-view' +} = require './metric-edit-view' { DataSource, -} = require 'limn/data/datasource-model' +} = require './datasource-model' /** * @class DataSet selection and customization UI (root of the `data` tab). @@ -17,7 +17,7 @@ DataView = exports.DataView = BaseView.extend do # {{{ __bind__ : <[ onMetricsChanged ]> tagName : 'section' className : 'data-ui' - template : require 'limn/template/data/data' + template : require '../template/data/data' datasources : null diff --git a/src/data/dataset-model.co b/src/data/dataset-model.co index 4b1502c..695690b 100644 --- a/src/data/dataset-model.co +++ b/src/data/dataset-model.co @@ -2,13 +2,13 @@ Seq = require 'seq' ColorBrewer = require 'colorbrewer' { _, op, -} = require 'limn/util' +} = require '../util' { BaseModel, BaseList, -} = require 'limn/base' +} = require '../base' { Metric, MetricList, -} = require 'limn/data/metric-model' +} = require './metric-model' { DataSource, DataSourceList, -} = require 'limn/data/datasource-model' +} = require './datasource-model' diff --git a/src/data/dataset-view.co b/src/data/dataset-view.co index 45c90d3..847fd9d 100644 --- a/src/data/dataset-view.co +++ b/src/data/dataset-view.co @@ -1,7 +1,7 @@ { _, op, -} = require 'limn/util' +} = require '../util' { BaseView, -} = require 'limn/base' +} = require '../base' /** @@ -10,7 +10,7 @@ DataSetView = exports.DataSetView = BaseView.extend do # {{{ tagName : 'section' className : 'dataset-ui dataset' - template : require 'limn/template/data/dataset' + template : require '../template/data/dataset' events: 'click .new-metric-button' : 'onNewMetric' @@ -112,7 +112,7 @@ DataSetView = exports.DataSetView = BaseView.extend do # {{{ DataSetMetricView = exports.DataSetMetricView = BaseView.extend do # {{{ tagName : 'tr' className : 'dataset-metric metric' - template : require 'limn/template/data/dataset-metric' + template : require '../template/data/dataset-metric' diff --git a/src/data/datasource-model.co b/src/data/datasource-model.co index 5dcf0bd..84c3b52 100644 --- a/src/data/datasource-model.co +++ b/src/data/datasource-model.co @@ -1,11 +1,11 @@ { _, op, -} = require 'limn/util' +} = require '../util' { TimeSeriesData, CSVData, -} = require 'limn/util/timeseries' +} = require '../util/timeseries' { BaseModel, BaseList, ModelCache, -} = require 'limn/base' +} = require '../base' { Metric, MetricList, -} = require 'limn/data/metric-model' +} = require './metric-model' /** diff --git a/src/data/datasource-ui-view.co b/src/data/datasource-ui-view.co index 6a7bffb..344eb82 100644 --- a/src/data/datasource-ui-view.co +++ b/src/data/datasource-ui-view.co @@ -1,7 +1,7 @@ { _, op, -} = require 'limn/util' +} = require '../util' { BaseModel, BaseList, BaseView, -} = require 'limn/base' +} = require '../base' /** @@ -12,7 +12,7 @@ DataSourceUIView = exports.DataSourceUIView = BaseView.extend do # {{{ __bind__ : <[ ]> tagName : 'section' className : 'datasource-ui' - template : require 'limn/template/data/datasource-ui' + template : require '../template/data/datasource-ui' events : 'click .datasource-summary' : 'onHeaderClick' diff --git a/src/data/datasource-view.co b/src/data/datasource-view.co index 57b1469..b086ac4 100644 --- a/src/data/datasource-view.co +++ b/src/data/datasource-view.co @@ -1,7 +1,7 @@ { _, op, -} = require 'limn/util' +} = require '../util' { BaseModel, BaseList, BaseView, -} = require 'limn/base' +} = require '../base' /** @@ -11,7 +11,7 @@ DataSourceView = exports.DataSourceView = BaseView.extend do # {{{ __bind__ : <[ ]> tagName : 'section' className : 'datasource' - template : require 'limn/template/data/datasource' + template : require '../template/data/datasource' diff --git a/src/data/index.co b/src/data/index.co index 1ed639d..24dbebf 100644 --- a/src/data/index.co +++ b/src/data/index.co @@ -1,11 +1,11 @@ -metric_model = require 'limn/data/metric-model' -metric_edit_view = require 'limn/data/metric-edit-view' -datasource_model = require 'limn/data/datasource-model' -datasource_view = require 'limn/data/datasource-view' -datasource_ui_view = require 'limn/data/datasource-ui-view' -dataset_model = require 'limn/data/dataset-model' -dataset_view = require 'limn/data/dataset-view' -data_view = require 'limn/data/data-view' +metric_model = require './metric-model' +metric_edit_view = require './metric-edit-view' +datasource_model = require './datasource-model' +datasource_view = require './datasource-view' +datasource_ui_view = require './datasource-ui-view' +dataset_model = require './dataset-model' +dataset_view = require './dataset-view' +data_view = require './data-view' exports import datasource_model import datasource_view import datasource_ui_view \ import dataset_model import dataset_view \ diff --git a/src/data/metric-edit-view.co b/src/data/metric-edit-view.co index 3aaa040..28a0904 100644 --- a/src/data/metric-edit-view.co +++ b/src/data/metric-edit-view.co @@ -1,11 +1,11 @@ { _, op, -} = require 'limn/util' +} = require '../util' { BaseView, -} = require 'limn/base' +} = require '../base' { Metric, -} = require 'limn/data/metric-model' +} = require './metric-model' { DataSourceUIView, -} = require 'limn/data/datasource-ui-view' +} = require './datasource-ui-view' @@ -17,7 +17,7 @@ MetricEditView = exports.MetricEditView = BaseView.extend do # {{{ __bind__ : <[ onChange ]> tagName : 'section' className : 'metric-edit-ui' - template : require 'limn/template/data/metric-edit' + template : require '../template/data/metric-edit' callOnReturnKeypress : 'onChange' events: diff --git a/src/data/metric-model.co b/src/data/metric-model.co index 1a00e4a..cd0bf59 100644 --- a/src/data/metric-model.co +++ b/src/data/metric-model.co @@ -1,8 +1,8 @@ { _, op, -} = require 'limn/util' +} = require '../util' { BaseModel, BaseList, -} = require 'limn/base' -ProjectColors = require 'limn/data/project-colors' +} = require '../base' +ProjectColors = require './project-colors' DataSource = DataSourceList = null @@ -170,6 +170,6 @@ MetricList = exports.MetricList = BaseList.extend do # {{{ ### FIXME: LOLHACKS ### setTimeout do - -> { DataSource, DataSourceList, } := require 'limn/data/datasource-model' + -> { DataSource, DataSourceList, } := require './datasource-model' 10 diff --git a/src/graph/graph-display-view.co b/src/graph/graph-display-view.co index cc31151..9f0540e 100644 --- a/src/graph/graph-display-view.co +++ b/src/graph/graph-display-view.co @@ -1,11 +1,11 @@ moment = require 'moment' { _, op, -} = require 'limn/util' +} = require '../util' { Graph, -} = require 'limn/graph/graph-model' +} = require './graph-model' { GraphView, -} = require 'limn/graph/graph-view' +} = require './graph-view' root = do -> this @@ -17,7 +17,7 @@ root = do -> this GraphDisplayView = exports.GraphDisplayView = GraphView.extend do # {{{ tagName : 'section' className : 'graph graph-display' - template : require 'limn/template/graph/graph-display' + template : require '../template/graph/graph-display' events: # Select the whole permalink URI text when it receives focus. diff --git a/src/graph/graph-edit-view.co b/src/graph/graph-edit-view.co index 2d0d1d8..d7bffa7 100644 --- a/src/graph/graph-edit-view.co +++ b/src/graph/graph-edit-view.co @@ -1,14 +1,14 @@ moment = require 'moment' -_ = require 'limn/util/underscore' +_ = require '../util/underscore' { Graph, -} = require 'limn/graph/graph-model' +} = require './graph-model' { GraphView, -} = require 'limn/graph/graph-view' +} = require './graph-view' { ChartOptionScaffold, DEBOUNCE_RENDER, -} = require 'limn/chart' +} = require '../chart' { DataView, DataSetView, DataSet, -} = require 'limn/data' +} = require '../data' root = do -> this @@ -26,7 +26,7 @@ GraphEditView = exports.GraphEditView = GraphView.extend do # {{{ onFirstClickRenderOptionsTab onFirstClickRenderDataTab ]> className : 'graph-edit graph' - template : require 'limn/template/graph/graph-edit' + template : require '../template/graph/graph-edit' events: 'click .redraw-button' : 'stopAndRender' diff --git a/src/graph/graph-list-view.co b/src/graph/graph-list-view.co index 7106aab..2f07f55 100644 --- a/src/graph/graph-list-view.co +++ b/src/graph/graph-list-view.co @@ -1,9 +1,9 @@ { _, op, -} = require 'limn/util' +} = require '../util' { BaseView, -} = require 'limn/base' +} = require '../base' { Graph, GraphList -} = require 'limn/graph/graph-model' +} = require './graph-model' root = do -> this DEBOUNCE_RENDER = 100ms @@ -19,7 +19,7 @@ GraphListView = exports.GraphListView = BaseView.extend do # {{{ tagName : 'section' className : 'graph-list-view' - template : require 'limn/template/graph/graph-list' + template : require '../template/graph/graph-list' data : {} ready : false diff --git a/src/graph/graph-model.co b/src/graph/graph-model.co index f710147..5d825d5 100644 --- a/src/graph/graph-model.co +++ b/src/graph/graph-model.co @@ -1,13 +1,13 @@ Seq = require 'seq' { _, Cascade, -} = require 'limn/util' +} = require '../util' { BaseModel, BaseList, ModelCache, -} = require 'limn/base' +} = require '../base' { ChartType, -} = require 'limn/chart' +} = require '../chart' { DataSet -} = require 'limn/data' +} = require '../data' root = do -> this diff --git a/src/graph/graph-view.co b/src/graph/graph-view.co index 52ea119..a9b1739 100644 --- a/src/graph/graph-view.co +++ b/src/graph/graph-view.co @@ -1,11 +1,11 @@ Seq = require 'seq' moment = require 'moment' -_ = require 'limn/util/underscore' +_ = require '../util/underscore' { BaseView, -} = require 'limn/base' +} = require '../base' { Graph, -} = require 'limn/graph/graph-model' +} = require './graph-model' root = do -> this DEBOUNCE_RENDER = 100ms diff --git a/src/graph/index.co b/src/graph/index.co index c8f65a4..a62d58b 100644 --- a/src/graph/index.co +++ b/src/graph/index.co @@ -1,7 +1,7 @@ -models = require 'limn/graph/graph-model' -base_views = require 'limn/graph/graph-view' -display_views = require 'limn/graph/graph-display-view' -edit_views = require 'limn/graph/graph-edit-view' -index_views = require 'limn/graph/graph-list-view' +models = require './graph-model' +base_views = require './graph-view' +display_views = require './graph-display-view' +edit_views = require './graph-edit-view' +index_views = require './graph-list-view' exports import models import base_views import display_views import edit_views import index_views diff --git a/src/index.co b/src/index.co new file mode 100644 index 0000000..968b989 --- /dev/null +++ b/src/index.co @@ -0,0 +1,2 @@ +module.exports = require './server/middleware' + diff --git a/src/limn.co b/src/limn.co index 16af2b9..a7224e1 100644 --- a/src/limn.co +++ b/src/limn.co @@ -3,15 +3,15 @@ limn = exports Backbone = require 'backbone' { _, op, root, -} = limn.util = require 'limn/util' +} = limn.util = require './util' { BaseView, BaseModel, BaseList, -} = limn.base = require 'limn/base' +} = limn.base = require './base' { ChartType, DygraphsChartType, -} = limn.chart = require 'limn/chart' +} = limn.chart = require './chart' { Graph, GraphList, GraphDisplayView, GraphEditView, GraphListView, -} = limn.graph = require 'limn/graph' +} = limn.graph = require './graph' { DashboardView, Dashboard, -} = limn.dashboard = require 'limn/dashboard' +} = limn.dashboard = require './dashboard' /** diff --git a/src/server/files.co b/src/server/files.co index b07f73e..98f182d 100644 --- a/src/server/files.co +++ b/src/server/files.co @@ -104,13 +104,13 @@ logErrorsAnd = exports.logErrorsAnd = (cb) -> ## Test Code if require.main is module files = exports - u = require 'limn/util/underscore' + u = require '../util/underscore' paths = <[ package.* deploy.sh ]> files.readFilesAsync paths, (err, data) -> if err then console.error err else console.log '\n\n', global.data = u.map data, (txt, f) -> "#f: #{txt.length}" - # u = require 'limn/util/underscore'; files = require 'limn/server/files' + # u = require '../util/underscore'; files = require 'limn/server/files' # files.readJSONFilesAsync 'data/**', {+yaml}, files.logErrorsAnd() diff --git a/src/server/server.co b/src/server/server.co index b866a13..2aa38db 100755 --- a/src/server/server.co +++ b/src/server/server.co @@ -24,6 +24,8 @@ app.use limn = app.limn = LimnMiddleware do enabled : true whitelist : /.*/ +# show exceptions, pretty stack traces ### FIXME +app.use express.errorHandler { +dumpExceptions, +showStack } /** * Handle webhook notification to pull from origin. diff --git a/src/server/view-helpers.co b/src/server/view-helpers.co index f222a41..5837480 100644 --- a/src/server/view-helpers.co +++ b/src/server/view-helpers.co @@ -1,17 +1,18 @@ # Utilities for use in templates -CWD = exports.CWD = process.cwd() -WWW = exports.WWW = "#CWD/www" -VAR = exports.VAR = "#CWD/var" -STATIC = exports.STATIC = "#CWD/static" +fs = exports.fs = require 'fs' +path = exports.path = require 'path' + +{dirname} = path +BASE = exports.BASE = dirname dirname __dirname +WWW = exports.WWW = "#BASE/www" +VAR = exports.VAR = "#BASE/var" +STATIC = exports.STATIC = "#BASE/static" VERSION = 'HEAD' try VERSION = require '../version' catch e exports.VERSION = exports.version = VERSION -fs = exports.fs = require 'fs' -path = exports.path = require 'path' - _ = exports._ = require 'underscore' _.str = require 'underscore.string' _.mixin _.str.exports() diff --git a/src/util/aliasdict.co b/src/util/aliasdict.co index 5ac539a..32ce71f 100644 --- a/src/util/aliasdict.co +++ b/src/util/aliasdict.co @@ -1,4 +1,4 @@ -_ = require 'limn/util/underscore' +_ = require './underscore' /** * @class A mapping of key-value pairs supporting key-aliases. diff --git a/src/util/cascade.co b/src/util/cascade.co index cfe474e..a103f49 100644 --- a/src/util/cascade.co +++ b/src/util/cascade.co @@ -1,4 +1,4 @@ -_ = require 'limn/util/underscore' +_ = require './underscore' hasOwn = ({}).hasOwnProperty diff --git a/src/util/event/index.co b/src/util/event/index.co index f31f727..abdd601 100644 --- a/src/util/event/index.co +++ b/src/util/event/index.co @@ -1,2 +1,2 @@ -exports.WaitingEmitter = require 'limn/util/event/waiting-emitter' -exports.ReadyEmitter = require 'limn/util/event/ready-emitter' +exports.WaitingEmitter = require './waiting-emitter' +exports.ReadyEmitter = require './ready-emitter' diff --git a/src/util/event/ready-emitter.co b/src/util/event/ready-emitter.co index 879dcf8..5d22658 100644 --- a/src/util/event/ready-emitter.co +++ b/src/util/event/ready-emitter.co @@ -1,4 +1,4 @@ -Base = require 'limn/base/base' +Base = require '../../base/base' /** diff --git a/src/util/event/waiting-emitter.co b/src/util/event/waiting-emitter.co index 876e07b..0f2a889 100644 --- a/src/util/event/waiting-emitter.co +++ b/src/util/event/waiting-emitter.co @@ -1,4 +1,4 @@ -Base = require 'limn/base/base' +Base = require '../../base/base' /** diff --git a/src/util/formatters.co b/src/util/formatters.co index d545835..b4d352b 100644 --- a/src/util/formatters.co +++ b/src/util/formatters.co @@ -1,7 +1,7 @@ moment = require 'moment' { _, op, -} = require 'limn/util' +} = require '../util' _fmt = do diff --git a/src/util/index.co b/src/util/index.co index f68bb6f..1686b86 100644 --- a/src/util/index.co +++ b/src/util/index.co @@ -1,5 +1,5 @@ -_ = exports._ = require 'limn/util/underscore' -op = exports.op = require 'limn/util/op' +_ = exports._ = require './underscore' +op = exports.op = require './op' # Root object -- `window` in the browser, `global` in Node. root = exports.root = do -> this @@ -26,13 +26,13 @@ root.jQuery?.fn.invoke = (method, ...args) -> jQuery(el)[method] ...args -exports import require 'limn/util/event' +exports import require './event' -backbone = exports.backbone = require 'limn/util/backbone' -parser = exports.parser = require 'limn/util/parser' -Cascade = exports.Cascade = require 'limn/util/cascade' +backbone = exports.backbone = require './backbone' +parser = exports.parser = require './parser' +Cascade = exports.Cascade = require './cascade' -# HashSet = exports.HashSet = require 'limn/util/hashset' -# BitString = exports.BitString = require 'limn/util/bitstring' -# {crc32} = exports.{crc32} = require 'limn/util/crc' +# HashSet = exports.HashSet = require './hashset' +# BitString = exports.BitString = require './bitstring' +# {crc32} = exports.{crc32} = require './crc' diff --git a/src/util/op.co b/src/util/op.co index e434d65..3dc9f68 100644 --- a/src/util/op.co +++ b/src/util/op.co @@ -1,17 +1,12 @@ -DASH_PATTERN = /-/g +DASH_PATTERN = /-/g STRIP_PAT = /(^\s*|\s*$)/g -strip = (s) -> - if s then s.replace STRIP_PAT, '' else s - FALSEY = /^\s*(?:no|off|false)\s*$/i parseBool = (s) -> i = parseInt(s or 0) !! if isNaN(i) then not FALSEY.test(s) else i - - -module.exports = op = +op = I : (x) -> x K : (k) -> -> k nop : -> @@ -80,7 +75,7 @@ module.exports = op = toRegExp : (v) -> new RegExp v toObject : (v) -> - if typeof v is 'string' and strip(v) + if typeof v is 'string' and op.strip(v) JSON.parse v else v @@ -150,5 +145,13 @@ module.exports = op = ord : -> String(it).charCodeAt 0 encode : -> it and $ "
#it
" .html().replace /"/g, '"' decode : -> it and $ "
#it
" .text() - strip : strip + strip : (s) -> + if s then s.replace STRIP_PAT, '' else s + + + +if module? + module?.exports = op +else if window? + window.op = op diff --git a/src/util/parser.co b/src/util/parser.co index 03137d8..b9879f3 100644 --- a/src/util/parser.co +++ b/src/util/parser.co @@ -1,7 +1,7 @@ -_ = require 'limn/util/underscore' -op = require 'limn/util/op' +_ = require './underscore' +op = require './op' { BaseModel, BaseList, BaseView, Mixin, -} = require 'limn/base' +} = require '../base' /** diff --git a/src/util/timeseries/csv.co b/src/util/timeseries/csv.co index 4599630..d56becc 100644 --- a/src/util/timeseries/csv.co +++ b/src/util/timeseries/csv.co @@ -1,5 +1,5 @@ -_ = require 'limn/util/underscore' -TimeSeriesData = require 'limn/util/timeseries/timeseries' +_ = require '../underscore' +TimeSeriesData = require './timeseries' DASH_PATTERN = /-/g diff --git a/src/util/timeseries/index.co b/src/util/timeseries/index.co index c729d0a..cd920ea 100644 --- a/src/util/timeseries/index.co +++ b/src/util/timeseries/index.co @@ -1,2 +1,2 @@ -exports.TimeSeriesData = require 'limn/util/timeseries/timeseries' -exports.CSVData = require 'limn/util/timeseries/csv' +exports.TimeSeriesData = require './timeseries' +exports.CSVData = require './csv' diff --git a/src/util/timeseries/timeseries.co b/src/util/timeseries/timeseries.co index 42c3f0f..e5e7bc0 100644 --- a/src/util/timeseries/timeseries.co +++ b/src/util/timeseries/timeseries.co @@ -1,4 +1,4 @@ -_ = require 'limn/util/underscore' +_ = require '../underscore' diff --git a/src/util/underscore/index.co b/src/util/underscore/index.co index de956ca..afb390a 100644 --- a/src/util/underscore/index.co +++ b/src/util/underscore/index.co @@ -2,12 +2,12 @@ _ = require 'underscore' _.str = require 'underscore.string' _.mixin _.str.exports() -_.mixin require 'limn/util/underscore/function' -_.mixin require 'limn/util/underscore/array' -_.mixin require 'limn/util/underscore/object' -_.mixin require 'limn/util/underscore/class' -_.mixin require 'limn/util/underscore/kv' -_.mixin require 'limn/util/underscore/string' +_.mixin require './function' +_.mixin require './array' +_.mixin require './object' +_.mixin require './class' +_.mixin require './kv' +_.mixin require './string' ## Debug diff --git a/src/version.js b/src/version.js index 6d4d75a..920505f 100644 --- a/src/version.js +++ b/src/version.js @@ -1 +1 @@ -module.exports = exports = '657d6d1'; +module.exports = exports = '9c55933'; -- 1.7.0.4