From 875a74ab2e33fcde2d69884f0735ba1cb79ac9f5 Mon Sep 17 00:00:00 2001 From: David Schoonover Date: Mon, 16 Jul 2012 16:02:28 -0700 Subject: [PATCH] Rebuilds lib/ with new name. Updates Cokefile to build dist/limn.js. Adds symlinks in www for testing dist files. --- Cokefile | 64 +- lib/app.js | 2 +- lib/app.mod.js | 62 -- lib/base/asset-manager.js | 4 +- lib/base/base-mixin.js | 2 +- lib/base/base-mixin.mod.js | 4 +- lib/base/base-model.js | 32 +- lib/base/base-model.mod.js | 34 +- lib/base/base-view.js | 8 +- lib/base/base-view.mod.js | 10 +- lib/base/base.js | 2 +- lib/base/base.mod.js | 4 +- lib/base/cascading-model.js | 6 +- lib/base/cascading-model.mod.js | 8 +- lib/base/data-binding.js | 2 +- lib/base/data-binding.mod.js | 4 +- lib/base/index.js | 14 +- lib/base/index.mod.js | 16 +- lib/base/model-cache.js | 2 +- lib/base/model-cache.mod.js | 4 +- lib/base/resource-router.js | 49 + lib/base/scaffold/index.js | 4 +- lib/base/scaffold/index.mod.js | 6 +- lib/base/scaffold/scaffold-model.js | 6 +- lib/base/scaffold/scaffold-model.mod.js | 8 +- lib/base/scaffold/scaffold-view.js | 8 +- lib/base/scaffold/scaffold-view.mod.js | 10 +- lib/chart/chart-type.js | 6 +- lib/chart/chart-type.mod.js | 8 +- 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 | 8 +- lib/chart/option/chart-option-view.js | 10 +- lib/chart/option/chart-option-view.mod.js | 12 +- 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 | 8 +- 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 | 8 +- lib/chart/type/d3/d3-chart-element.js | 4 +- lib/chart/type/d3/d3-chart-element.mod.js | 6 +- 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 | 8 +- 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 | 6 +- lib/chart/type/index.mod.js | 2 +- lib/dashboard/dashboard-model.js | 9 +- lib/dashboard/dashboard-model.mod.js | 11 +- lib/dashboard/dashboard-view.js | 12 +- lib/dashboard/dashboard-view.mod.js | 14 +- lib/dashboard/index.js | 4 +- lib/dashboard/index.mod.js | 6 +- lib/data/data-view.js | 12 +- lib/data/data-view.mod.js | 14 +- lib/data/dataset-model.js | 8 +- lib/data/dataset-model.mod.js | 10 +- lib/data/dataset-view.js | 8 +- lib/data/dataset-view.mod.js | 10 +- lib/data/datasource-model.js | 8 +- lib/data/datasource-model.mod.js | 10 +- lib/data/datasource-ui-view.js | 6 +- lib/data/datasource-ui-view.mod.js | 8 +- lib/data/datasource-view.js | 6 +- lib/data/datasource-view.mod.js | 8 +- 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 | 12 +- lib/data/metric-model.js | 8 +- lib/data/metric-model.mod.js | 10 +- lib/data/project-colors.mod.js | 2 +- lib/graph/graph-display-view.js | 10 +- lib/graph/graph-display-view.mod.js | 12 +- lib/graph/graph-edit-view.js | 21 +- lib/graph/graph-edit-view.mod.js | 23 +- lib/graph/graph-list-view.js | 17 +- lib/graph/graph-list-view.mod.js | 19 +- lib/graph/graph-model.js | 8 +- lib/graph/graph-model.mod.js | 10 +- lib/graph/graph-view.js | 9 +- lib/graph/graph-view.mod.js | 11 +- lib/graph/index.js | 10 +- lib/graph/index.mod.js | 12 +- lib/limn.js | 150 +++ lib/limn.mod.js | 154 ++++ lib/main-dashboard.js | 30 - lib/main-display.js | 32 - lib/main-edit.js | 33 - lib/main-graph-list.js | 23 - lib/server/controller.js | 30 +- lib/server/controllers/dashboard.js | 5 +- lib/server/controllers/datasource.js | 107 +-- lib/server/controllers/graph.js | 100 +-- lib/server/file-controller.js | 87 +- lib/server/files.js | 62 +- lib/server/middleware.js | 160 +++-- lib/server/proxy.js | 18 +- lib/server/server.js | 30 +- lib/server/view-helpers.js | 2 +- lib/template/chart/chart-option.jade.mod.js | 2 +- lib/template/chart/chart-scaffold.jade.mod.js | 2 +- lib/template/dashboard/dashboard-tab.jade.mod.js | 2 +- lib/template/dashboard/dashboard.jade.mod.js | 2 +- lib/template/data/data.jade.mod.js | 2 +- lib/template/data/dataset-metric.jade.mod.js | 2 +- lib/template/data/dataset.jade.mod.js | 2 +- lib/template/data/datasource-ui.jade.js | 4 +- lib/template/data/datasource-ui.jade.mod.js | 6 +- lib/template/data/datasource.jade.mod.js | 2 +- lib/template/data/metric-edit.jade.mod.js | 2 +- lib/template/graph/graph-display.jade.mod.js | 2 +- lib/template/graph/graph-edit.jade.js | 10 +- lib/template/graph/graph-edit.jade.mod.js | 12 +- lib/template/graph/graph-list.jade.js | 4 +- lib/template/graph/graph-list.jade.mod.js | 6 +- lib/util/aliasdict.js | 2 +- lib/util/backbone.mod.js | 2 +- lib/util/cascade.js | 2 +- lib/util/cascade.mod.js | 4 +- 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 | 4 +- lib/util/event/waiting-emitter.js | 2 +- lib/util/event/waiting-emitter.mod.js | 4 +- lib/util/formatters.js | 2 +- lib/util/formatters.mod.js | 4 +- lib/util/index.js | 12 +- lib/util/index.mod.js | 14 +- lib/util/op.mod.js | 2 +- lib/util/parser.js | 6 +- lib/util/parser.mod.js | 8 +- lib/util/timeseries/csv.js | 4 +- lib/util/timeseries/csv.mod.js | 6 +- 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 | 4 +- lib/util/underscore/array.mod.js | 2 +- lib/util/underscore/class.mod.js | 2 +- lib/util/underscore/function.mod.js | 2 +- lib/util/underscore/index.js | 12 +- lib/util/underscore/index.mod.js | 14 +- lib/util/underscore/kv.mod.js | 2 +- lib/util/underscore/object.mod.js | 2 +- lib/util/underscore/string.mod.js | 2 +- src/version.js | 1 + static/vendor/browserify.js | 259 +++--- static/vendor/underscore.mod.js | 1064 ++++++++++++++++++++++ www/css/graph.css | 3 + www/js/limn.js | 1 + www/js/limn.min.js | 1 + www/modules.yaml | 6 +- 159 files changed, 2467 insertions(+), 1042 deletions(-) delete mode 100644 lib/app.mod.js create mode 100644 lib/base/resource-router.js create mode 100644 lib/limn.js create mode 100644 lib/limn.mod.js delete mode 100644 lib/main-dashboard.js delete mode 100644 lib/main-display.js delete mode 100644 lib/main-edit.js delete mode 100644 lib/main-graph-list.js create mode 100644 src/version.js create mode 100644 static/vendor/underscore.mod.js create mode 120000 www/js/limn.js create mode 120000 www/js/limn.min.js diff --git a/Cokefile b/Cokefile index 949701e..876cf99 100644 --- a/Cokefile +++ b/Cokefile @@ -4,8 +4,14 @@ require 'buildtools/tasks' {removeSync:remove} = require 'remove' -MODULE_LINK = 'node_modules/limn' +MODULE_LINK = 'node_modules/limn' +APP_BUNDLE_PATH = 'var/js/limn.no-deps.js' +APP_BUNDLE_MIN_PATH = APP_BUNDLE_PATH.replace /\.js$/, '.min.js' +VENDOR_BUNDLE_PATH = 'var/vendor/vendor-bundle.js' +VENDOR_BUNDLE_MIN_PATH = VENDOR_BUNDLE_PATH.replace /\.js$/, '.min.js' +DIST_PATH = 'dist/limn.js' +DIST_MIN_PATH = DIST_PATH.replace /\.js$/, '.min.js' @@ -25,7 +31,7 @@ task \install 'Install project dependencies.' -> task \setup 'Ensure project is set up for development.' -> invoke \install invoke \link - invoke \update_version + err, version <- writeVersionFile 'src/version.js' task \server 'Start dev server' -> @@ -38,7 +44,7 @@ task \build 'Build coco sources' -> invoke \setup coco <[ -bjc package.co ]> - {sources} = require 'limn/server/view-helpers' + {sources} = require 'limn/server/view-helpers' browserify = require 'browserify' Coco = require 'coco' Jade = require 'jade' @@ -47,6 +53,7 @@ task \build 'Build coco sources' -> yaml = require 'js-yaml' matchExt = /((?:\.min)?)\.mod((?:\.min)?)\.js$/i + fullExt = /(\.(min|mod|amd|jade))*\.js$/i console.log 'Building source...' Seq() @@ -85,11 +92,13 @@ task \build 'Build coco sources' -> .set sources("www/modules.yaml", 'development').map -> it.slice 1 .seqEach (srcfile) -> return @ok() unless matchExt.test srcfile - outfile = (if _.startsWith srcfile, 'vendor' then 'static' else 'www') + '/' + srcfile + outfile = (if _.startsWith srcfile, 'vendor' then 'static' else 'lib') + '/' + srcfile.replace /^js\/limn\//, '' infile = outfile.replace matchExt, '$1$2.js' - return @ok() unless exists infile + unless exists infile + console.log " Wrapping JS in Module:\t Cannot find #infile!" + return @ok() return @ok() if _.startsWith(srcfile, 'vendor') and exists outfile - parts = infile.replace matchExt, '' .split '/' .slice 2 + parts = srcfile.replace fullExt, '' .split '/' .slice 1 parts.pop() if 'index' is _.last parts ID = parts.join '/' console.log " Wrapping JS in Module:\t #infile \t-->\t #outfile" @@ -128,37 +137,49 @@ task \build 'Build coco sources' -> task \bundle 'Build application and vendor bundles' -> invoke \bundle_app invoke \bundle_vendor + invoke \bundle_combine task \bundle_app 'Build application bundle' -> {sources} = require 'limn/server/view-helpers' - app_bundle_path = 'var/js/limn/app-bundle.js' app_sources = sources("www/modules.yaml", 'development') .filter -> not _.startsWith it, '/vendor' .map -> it.slice 1 .replace /js\/limn/, 'lib' - mkdirp dirname app_bundle_path - bundle_js app_bundle_path, app_sources, {-minify} + mkdirp dirname APP_BUNDLE_PATH + bundle_js APP_BUNDLE_PATH, app_sources, {-minify} - app_bundle_min_path = app_bundle_path.replace /\.js$/, '.min.js' - print 'Minifying into', app_bundle_min_path.magenta.bold, '... ' - write app_bundle_min_path, minify read app_bundle_path + APP_BUNDLE_MIN_PATH = APP_BUNDLE_PATH.replace /\.js$/, '.min.js' + print 'Minifying into', APP_BUNDLE_MIN_PATH.magenta.bold, '... ' + write APP_BUNDLE_MIN_PATH, minify read APP_BUNDLE_PATH say 'ok.\n' task \bundle_vendor 'Build vendor bundle' -> {sources} = require 'limn/server/view-helpers' - vendor_bundle_path = 'var/vendor/vendor-bundle.js' + VENDOR_BUNDLE_PATH = 'var/vendor/vendor-bundle.js' vendor_sources = sources("www/modules.yaml", 'development') .filter -> _.startsWith it, '/vendor' .map -> "static#it" - mkdirp dirname vendor_bundle_path - bundle_js vendor_bundle_path, vendor_sources, {-minify} + mkdirp dirname VENDOR_BUNDLE_PATH + bundle_js VENDOR_BUNDLE_PATH, vendor_sources, {-minify} - vendor_bundle_min_path = vendor_bundle_path.replace /\.js$/, '.min.js' - print 'Minifying into', vendor_bundle_min_path.magenta.bold, '... ' - write vendor_bundle_min_path, minify read vendor_bundle_path + VENDOR_BUNDLE_MIN_PATH = VENDOR_BUNDLE_PATH.replace /\.js$/, '.min.js' + print 'Minifying into', VENDOR_BUNDLE_MIN_PATH.magenta.bold, '... ' + write VENDOR_BUNDLE_MIN_PATH, minify read VENDOR_BUNDLE_PATH say 'ok.\n' +task \bundle_combine 'Combine bundles into dist file' -> + print 'Writing dist file', DIST_PATH.magenta.bold , '... ' + mkdirp dirname DIST_PATH + write DIST_PATH, "#{read VENDOR_BUNDLE_PATH}\n#{read APP_BUNDLE_PATH}\n" + say 'ok.\n' + + print 'Writing minified dist file', DIST_MIN_PATH.magenta.bold , '... ' + mkdirp dirname DIST_MIN_PATH + write DIST_MIN_PATH, "#{read VENDOR_BUNDLE_MIN_PATH}\n#{read APP_BUNDLE_MIN_PATH}\n" + say 'ok.\n' + + task \test 'Rebuild test files and run tests' -> @@ -194,7 +215,7 @@ task \cleanup_tests 'Removes compiled tests' -> task \clean 'Clean up environment and artifacts' -> invoke \cleanup_tests - remove [MODULE_LINK, 'var', 'tmp/dist'], {+ignoreMissing, +verbose} + remove [MODULE_LINK, 'lib', 'var', 'dist'], {+ignoreMissing, +verbose} @@ -207,8 +228,3 @@ task \source_list 'Print a list of the source file paths.' -> .join '\n' -# task \dist 'Assemble a distribution package for deploy' -> -# invoke \cleanup_tests -# ... - - diff --git a/lib/app.js b/lib/app.js index b4937f3..4b2153d 100644 --- a/lib/app.js +++ b/lib/app.js @@ -1,6 +1,6 @@ var Backbone, op, AppView, _ref, _; Backbone = require('backbone'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; /** * @class Application view, automatically attaching to an existing element * found at `appSelector`. diff --git a/lib/app.mod.js b/lib/app.mod.js deleted file mode 100644 index e816fc5..0000000 --- a/lib/app.mod.js +++ /dev/null @@ -1,62 +0,0 @@ -require.define('/node_modules/kraken/app.js.js', function(require, module, exports, __dirname, __filename, undefined){ - -var Backbone, op, AppView, _ref, _; -Backbone = require('backbone'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -/** - * @class Application view, automatically attaching to an existing element - * found at `appSelector`. - * @extends Backbone.View - */ -AppView = exports.AppView = Backbone.View.extend({ - appSelector: '#content .inner' - /** - * @constructor - */, - constructor: (function(){ - function AppView(options){ - var that, _this = this; - options == null && (options = {}); - if (typeof options === 'function') { - this.initialize = options; - options = {}; - } else { - if (that = options.initialize) { - this.initialize = that; - } - } - if (that = options.appSelector) { - this.appSelector = that; - } - options.el || (options.el = jQuery(this.appSelector)[0]); - Backbone.View.call(this, options); - jQuery(function(){ - return _this.render(); - }); - return this; - } - return AppView; - }()) - /** - * Override to set up your app. This method may be passed - * as an option to the constructor. - */, - initialize: function(){} - /** - * Append subviews. - */, - render: function(){ - var _ref; - if (this.view && !((_ref = this.view.$el.parent()) != null && _ref.length)) { - return this.$el.append(this.view.el); - } - }, - getClassName: function(){ - return (this.constructor.name || this.constructor.displayName) + ""; - }, - toString: function(){ - return this.getClassName() + "()"; - } -}); - -}); diff --git a/lib/base/asset-manager.js b/lib/base/asset-manager.js index d65ef1e..777e183 100644 --- a/lib/base/asset-manager.js +++ b/lib/base/asset-manager.js @@ -1,6 +1,6 @@ var op, ReadyEmitter, AssetManager, _ref, _; -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -ReadyEmitter = require('kraken/util/event').ReadyEmitter; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +ReadyEmitter = require('limn/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 eba7b88..95e44a0 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('kraken/util'), _ = _ref._, op = _ref.op; +_ref = require('limn/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 e2c68e2..c2ad253 100644 --- a/lib/base/base-mixin.mod.js +++ b/lib/base/base-mixin.mod.js @@ -1,8 +1,8 @@ -require.define('/node_modules/kraken/base/base-mixin.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/base/base-mixin.js', function(require, module, exports, __dirname, __filename, undefined){ var Backbone, op, BaseBackboneMixin, Mixin, mixinBase, _ref, _, __slice = [].slice; Backbone = require('backbone'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; +_ref = require('limn/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 7a4a6d6..2d83a61 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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base/base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('limn/base/base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase; /** * @class Base model, extending Backbone.Model, used by scaffold and others. * @extends Backbone.Model @@ -220,6 +220,34 @@ BaseList = exports.BaseList = Backbone.Collection.extend(mixinBase({ return it.id || it.get('id') || it.cid; }); }, + url: function(){ + var id; + id = this.get('id') || this.get('slug'); + if (id) { + return this.urlRoot + "/" + id + ".json"; + } else { + return this.urlRoot + ".json"; + } + }, + load: function(){ + return this.loadCollection(); + }, + loadCollection: function(){ + var _this = this; + this.wait(); + this.trigger('load', this); + this.fetch({ + success: function(){ + _this.unwait(); + return _this.trigger('load-success', _this); + }, + error: function(){ + _this.unwait(); + return _this.trigger.apply(_this, ['load-error', _this].concat(__slice.call(arguments))); + } + }); + return this; + }, toKVPairs: function(){ return _.collapseObject(this.toJSON()); }, diff --git a/lib/base/base-model.mod.js b/lib/base/base-model.mod.js index 1fdd53b..1c2b0c4 100644 --- a/lib/base/base-model.mod.js +++ b/lib/base/base-model.mod.js @@ -1,9 +1,9 @@ -require.define('/node_modules/kraken/base/base-model.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/base/base-model.js', function(require, module, exports, __dirname, __filename, undefined){ var Backbone, op, BaseBackboneMixin, mixinBase, BaseModel, BaseList, _ref, _, __slice = [].slice; Backbone = require('backbone'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base/base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('limn/base/base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase; /** * @class Base model, extending Backbone.Model, used by scaffold and others. * @extends Backbone.Model @@ -222,6 +222,34 @@ BaseList = exports.BaseList = Backbone.Collection.extend(mixinBase({ return it.id || it.get('id') || it.cid; }); }, + url: function(){ + var id; + id = this.get('id') || this.get('slug'); + if (id) { + return this.urlRoot + "/" + id + ".json"; + } else { + return this.urlRoot + ".json"; + } + }, + load: function(){ + return this.loadCollection(); + }, + loadCollection: function(){ + var _this = this; + this.wait(); + this.trigger('load', this); + this.fetch({ + success: function(){ + _this.unwait(); + return _this.trigger('load-success', _this); + }, + error: function(){ + _this.unwait(); + return _this.trigger.apply(_this, ['load-error', _this].concat(__slice.call(arguments))); + } + }); + return this; + }, toKVPairs: function(){ return _.collapseObject(this.toJSON()); }, diff --git a/lib/base/base-view.js b/lib/base/base-view.js index 9dec625..aac1098 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; Backbone = require('backbone'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base/base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase; -BaseModel = require('kraken/base/base-mixin').BaseModel; -DataBinding = require('kraken/base/data-binding').DataBinding; +_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; /** * @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 2105eea..7b3e07f 100644 --- a/lib/base/base-view.mod.js +++ b/lib/base/base-view.mod.js @@ -1,11 +1,11 @@ -require.define('/node_modules/kraken/base/base-view.js.js', function(require, module, exports, __dirname, __filename, undefined){ +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; Backbone = require('backbone'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base/base-mixin'), BaseBackboneMixin = _ref.BaseBackboneMixin, mixinBase = _ref.mixinBase; -BaseModel = require('kraken/base/base-mixin').BaseModel; -DataBinding = require('kraken/base/data-binding').DataBinding; +_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; /** * @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 e3f4bce..a053582 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('kraken/util'), _ = _ref._, op = _ref.op; +_ref = require('limn/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 68ac0c5..1be5b75 100644 --- a/lib/base/base.mod.js +++ b/lib/base/base.mod.js @@ -1,10 +1,10 @@ -require.define('/node_modules/kraken/base/base.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/base/base.js', function(require, module, exports, __dirname, __filename, undefined){ 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('kraken/util'), _ = _ref._, op = _ref.op; +_ref = require('limn/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 8a1f89c..3fd3f9d 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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base/base-model'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; -Cascade = require('kraken/util/cascade'); +_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'); /** * @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 5fc62d5..5a19a6d 100644 --- a/lib/base/cascading-model.mod.js +++ b/lib/base/cascading-model.mod.js @@ -1,9 +1,9 @@ -require.define('/node_modules/kraken/base/cascading-model.js.js', function(require, module, exports, __dirname, __filename, undefined){ +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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base/base-model'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; -Cascade = require('kraken/util/cascade'); +_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'); /** * @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 9f1835c..8ddc4a3 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('kraken/util'), _ = _ref._, op = _ref.op; +_ref = require('limn/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 957bc2c..f6c0475 100644 --- a/lib/base/data-binding.mod.js +++ b/lib/base/data-binding.mod.js @@ -1,8 +1,8 @@ -require.define('/node_modules/kraken/base/data-binding.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/base/data-binding.js', function(require, module, exports, __dirname, __filename, undefined){ var Backbone, op, DataBinding, _ref, _; Backbone = require('backbone'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; +_ref = require('limn/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 1c9458c..62833c4 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('kraken/base/base'); -mixins = require('kraken/base/base-mixin'); -models = require('kraken/base/base-model'); -views = require('kraken/base/base-view'); -cache = require('kraken/base/model-cache'); -cascading = require('kraken/base/cascading-model'); -data_binding = require('kraken/base/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'); __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 a599753..8e7fb07 100644 --- a/lib/base/index.mod.js +++ b/lib/base/index.mod.js @@ -1,13 +1,13 @@ -require.define('/node_modules/kraken/base/index.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/base.js', function(require, module, exports, __dirname, __filename, undefined){ var mixins, models, views, cache, cascading, data_binding; -exports.Base = require('kraken/base/base'); -mixins = require('kraken/base/base-mixin'); -models = require('kraken/base/base-model'); -views = require('kraken/base/base-view'); -cache = require('kraken/base/model-cache'); -cascading = require('kraken/base/cascading-model'); -data_binding = require('kraken/base/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'); __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 f07c776..e951ad1 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('kraken/util/event').ReadyEmitter; +ReadyEmitter = require('limn/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 4e529f9..32dae37 100644 --- a/lib/base/model-cache.mod.js +++ b/lib/base/model-cache.mod.js @@ -1,9 +1,9 @@ -require.define('/node_modules/kraken/base/model-cache.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/base/model-cache.js', function(require, module, exports, __dirname, __filename, undefined){ var Seq, ReadyEmitter, ModelCache, _; _ = require('underscore'); Seq = require('seq'); -ReadyEmitter = require('kraken/util/event').ReadyEmitter; +ReadyEmitter = require('limn/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 new file mode 100644 index 0000000..fd3aa97 --- /dev/null +++ b/lib/base/resource-router.js @@ -0,0 +1,49 @@ +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; +ResourceRouter = exports.ResourceRouter = Backbone.Router.extend(mixinBase({ + __bind__: [] + /** + * Singular, lowercase resource-noun. + * @optional + * @type String + * @example "user" + */, + id: null + /** + * Plural, lowercase resource-noun. + * @required + * @type String + * @example "users" + */, + name: null, + constructor: (function(){ + function ResourceRouter(opts){ + opts == null && (opts = {}); + this.__class__ = this.constructor; + this.__superclass__ = this.constructor.__super__.constructor; + this.waitingOn = 0; + opts.routes || (opts.routes = this.makeRoutes()); + return Backbone.Router.apply(this, opts); + } + return ResourceRouter; + }()), + makeRoutes: function(){ + var name, id, routes; + name = this.name, id = this.id; + routes = {}; + if (typeof this.create === 'function') { + routes[name + "/(new|edit)"] = this.create; + } + if (typeof this.edit === 'function') { + routes[name + "/:" + id + "/edit"] = this.edit; + } + if (typeof this.show === 'function') { + routes[name + "/:" + id] = this.show; + } + if (typeof this.index === 'function') { + return routes[name + ""] = this.index; + } + } +})); \ No newline at end of file diff --git a/lib/base/scaffold/index.js b/lib/base/scaffold/index.js index c0ee89d..fecf1b8 100644 --- a/lib/base/scaffold/index.js +++ b/lib/base/scaffold/index.js @@ -1,6 +1,6 @@ var models, views; -models = require('kraken/base/scaffold/scaffold-model'); -views = require('kraken/base/scaffold/scaffold-view'); +models = require('limn/base/scaffold/scaffold-model'); +views = require('limn/base/scaffold/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 2278e76..9ec5c5e 100644 --- a/lib/base/scaffold/index.mod.js +++ b/lib/base/scaffold/index.mod.js @@ -1,8 +1,8 @@ -require.define('/node_modules/kraken/base/scaffold/index.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/base/scaffold.js', function(require, module, exports, __dirname, __filename, undefined){ var models, views; -models = require('kraken/base/scaffold/scaffold-model'); -views = require('kraken/base/scaffold/scaffold-view'); +models = require('limn/base/scaffold/scaffold-model'); +views = require('limn/base/scaffold/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 948a703..311b975 100644 --- a/lib/base/scaffold/scaffold-model.js +++ b/lib/base/scaffold/scaffold-model.js @@ -1,7 +1,7 @@ var op, BaseModel, BaseList, Field, FieldList, _, _ref, __slice = [].slice; -_ = require('kraken/util/underscore'); -op = require('kraken/util/op'); -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +_ = require('limn/util/underscore'); +op = require('limn/util/op'); +_ref = require('limn/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 ee06f50..a0b4836 100644 --- a/lib/base/scaffold/scaffold-model.mod.js +++ b/lib/base/scaffold/scaffold-model.mod.js @@ -1,9 +1,9 @@ -require.define('/node_modules/kraken/base/scaffold/scaffold-model.js.js', function(require, module, exports, __dirname, __filename, undefined){ +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('kraken/util/underscore'); -op = require('kraken/util/op'); -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +_ = require('limn/util/underscore'); +op = require('limn/util/op'); +_ref = require('limn/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 2bc3791..ee47968 100644 --- a/lib/base/scaffold/scaffold-view.js +++ b/lib/base/scaffold/scaffold-view.js @@ -1,8 +1,8 @@ var op, BaseView, Field, FieldList, FieldView, Scaffold, _, _ref; -_ = require('kraken/util/underscore'); -op = require('kraken/util/op'); -BaseView = require('kraken/base').BaseView; -_ref = require('kraken/base/scaffold/scaffold-model'), Field = _ref.Field, FieldList = _ref.FieldList; +_ = 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; 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 f71a8da..070156e 100644 --- a/lib/base/scaffold/scaffold-view.mod.js +++ b/lib/base/scaffold/scaffold-view.mod.js @@ -1,10 +1,10 @@ -require.define('/node_modules/kraken/base/scaffold/scaffold-view.js.js', function(require, module, exports, __dirname, __filename, undefined){ +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('kraken/util/underscore'); -op = require('kraken/util/op'); -BaseView = require('kraken/base').BaseView; -_ref = require('kraken/base/scaffold/scaffold-model'), Field = _ref.Field, FieldList = _ref.FieldList; +_ = 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; FieldView = exports.FieldView = BaseView.extend({ tagName: 'div', className: 'field', diff --git a/lib/chart/chart-type.js b/lib/chart/chart-type.js index 037682a..b6e1e0b 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('kraken/util'), _ = _ref._, op = _ref.op; -ReadyEmitter = require('kraken/util/event').ReadyEmitter; -_ref = require('kraken/util/parser'), Parsers = _ref.Parsers, ParserMixin = _ref.ParserMixin; +_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; /** * 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 40aaea3..8fa3fc0 100644 --- a/lib/chart/chart-type.mod.js +++ b/lib/chart/chart-type.mod.js @@ -1,11 +1,11 @@ -require.define('/node_modules/kraken/chart/chart-type.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/chart/chart-type.js', function(require, module, exports, __dirname, __filename, undefined){ var moment, Backbone, op, ReadyEmitter, Parsers, ParserMixin, KNOWN_CHART_TYPES, ChartType, _ref, _, __slice = [].slice; moment = require('moment'); Backbone = require('backbone'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -ReadyEmitter = require('kraken/util/event').ReadyEmitter; -_ref = require('kraken/util/parser'), Parsers = _ref.Parsers, ParserMixin = _ref.ParserMixin; +_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; /** * Map of known libraries by name. * @type Object diff --git a/lib/chart/index.js b/lib/chart/index.js index 21c43f1..21f339f 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('kraken/chart/chart-type'); -chart_option = require('kraken/chart/option'); -dygraphs = require('kraken/chart/type/dygraphs'); -d3_chart = require('kraken/chart/type/d3-chart'); -d3_elements = require('kraken/chart/type/d3'); +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'); __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 7734fba..49ce799 100644 --- a/lib/chart/index.mod.js +++ b/lib/chart/index.mod.js @@ -1,11 +1,11 @@ -require.define('/node_modules/kraken/chart/index.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/chart.js', function(require, module, exports, __dirname, __filename, undefined){ var chart_type, chart_option, dygraphs, d3_chart, d3_elements; -chart_type = require('kraken/chart/chart-type'); -chart_option = require('kraken/chart/option'); -dygraphs = require('kraken/chart/type/dygraphs'); -d3_chart = require('kraken/chart/type/d3-chart'); -d3_elements = require('kraken/chart/type/d3'); +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'); __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 4b7382f..91f0180 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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/util/parser'), Parsers = _ref.Parsers, ParserMixin = _ref.ParserMixin, ParsingModel = _ref.ParsingModel, ParsingView = _ref.ParsingView; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +_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; /** * @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 50446ba..97dde6c 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/kraken/chart/option/chart-option-model.js.js', function(require, module, exports, __dirname, __filename, undefined){ +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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/util/parser'), Parsers = _ref.Parsers, ParserMixin = _ref.ParserMixin, ParsingModel = _ref.ParsingModel, ParsingView = _ref.ParsingView; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +_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; /** * @class A set of tags. */ diff --git a/lib/chart/option/chart-option-view.js b/lib/chart/option/chart-option-view.js index 99a9a41..549be0f 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('kraken/util'), _ = _ref._, op = _ref.op; -BaseView = require('kraken/base').BaseView; -_ref = require('kraken/chart/option/chart-option-model'), ChartOption = _ref.ChartOption, ChartOptionList = _ref.ChartOptionList; +_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; 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('kraken/template/chart/chart-option'), + template: require('limn/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('kraken/template/chart/chart-scaffold'), + template: require('limn/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 8bf441a..a8f8a19 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/kraken/chart/option/chart-option-view.js.js', function(require, module, exports, __dirname, __filename, undefined){ +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('kraken/util'), _ = _ref._, op = _ref.op; -BaseView = require('kraken/base').BaseView; -_ref = require('kraken/chart/option/chart-option-model'), ChartOption = _ref.ChartOption, ChartOptionList = _ref.ChartOptionList; +_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; 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('kraken/template/chart/chart-option'), + template: require('limn/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('kraken/template/chart/chart-scaffold'), + template: require('limn/template/chart/chart-scaffold'), collectionType: ChartOptionList, subviewType: ChartOptionView, events: { diff --git a/lib/chart/option/index.js b/lib/chart/option/index.js index 09d95b7..b05b991 100644 --- a/lib/chart/option/index.js +++ b/lib/chart/option/index.js @@ -1,6 +1,6 @@ var model, view; -model = require('kraken/chart/option/chart-option-model'); -view = require('kraken/chart/option/chart-option-view'); +model = require('limn/chart/option/chart-option-model'); +view = require('limn/chart/option/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 15c866d..aa94c03 100644 --- a/lib/chart/option/index.mod.js +++ b/lib/chart/option/index.mod.js @@ -1,8 +1,8 @@ -require.define('/node_modules/kraken/chart/option/index.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/chart/option.js', function(require, module, exports, __dirname, __filename, undefined){ var model, view; -model = require('kraken/chart/option/chart-option-model'); -view = require('kraken/chart/option/chart-option-view'); +model = require('limn/chart/option/chart-option-model'); +view = require('limn/chart/option/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 adce99c..244a437 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('kraken/util'), _ = _ref._, op = _ref.op; -ChartType = require('kraken/chart/chart-type').ChartType; -D3ChartElement = require('kraken/chart/type/d3/d3-chart-element').D3ChartElement; +_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; root = function(){ return this; }(); diff --git a/lib/chart/type/d3-chart.mod.js b/lib/chart/type/d3-chart.mod.js index f6817e0..324a2ce 100644 --- a/lib/chart/type/d3-chart.mod.js +++ b/lib/chart/type/d3-chart.mod.js @@ -1,11 +1,11 @@ -require.define('/node_modules/kraken/chart/type/d3-chart.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/chart/type/d3-chart.js', function(require, module, exports, __dirname, __filename, undefined){ var d3, ColorBrewer, op, ChartType, D3ChartElement, root, D3ChartType, _ref, _; d3 = require('d3'); ColorBrewer = require('colorbrewer'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -ChartType = require('kraken/chart/chart-type').ChartType; -D3ChartElement = require('kraken/chart/type/d3/d3-chart-element').D3ChartElement; +_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; 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 fa0746a..d9986f2 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('kraken/util'), _ = _ref._, op = _ref.op; -ChartType = require('kraken/chart/chart-type').ChartType; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +ChartType = require('limn/chart/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 b1248b2..357f44d 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('kraken/util'), _ = _ref._, op = _ref.op; -D3ChartElement = require('kraken/chart/type/d3/d3-chart-element').D3ChartElement; -_fmt = require('kraken/util/formatters'); +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +D3ChartElement = require('limn/chart/type/d3/d3-chart-element').D3ChartElement; +_fmt = require('limn/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 cd8d26a..5316769 100644 --- a/lib/chart/type/d3/d3-bar-element.mod.js +++ b/lib/chart/type/d3/d3-bar-element.mod.js @@ -1,10 +1,10 @@ -require.define('/node_modules/kraken/chart/type/d3/d3-bar-element.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/chart/type/d3/d3-bar-element.js', function(require, module, exports, __dirname, __filename, undefined){ var d3, op, D3ChartElement, root, BarChartType, _ref, _, _fmt; d3 = require('d3'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -D3ChartElement = require('kraken/chart/type/d3/d3-chart-element').D3ChartElement; -_fmt = require('kraken/util/formatters'); +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +D3ChartElement = require('limn/chart/type/d3/d3-chart-element').D3ChartElement; +_fmt = require('limn/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 d61b091..3eaac59 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('kraken/util'), _ = _ref._, op = _ref.op; -ReadyEmitter = require('kraken/util/event').ReadyEmitter; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +ReadyEmitter = require('limn/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 4a9e29e..bf57c82 100644 --- a/lib/chart/type/d3/d3-chart-element.mod.js +++ b/lib/chart/type/d3/d3-chart-element.mod.js @@ -1,10 +1,10 @@ -require.define('/node_modules/kraken/chart/type/d3/d3-chart-element.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/chart/type/d3/d3-chart-element.js', function(require, module, exports, __dirname, __filename, undefined){ var d3, ColorBrewer, op, ReadyEmitter, root, KNOWN_CHART_ELEMENTS, D3ChartElement, _ref, _, __slice = [].slice; d3 = require('d3'); ColorBrewer = require('colorbrewer'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -ReadyEmitter = require('kraken/util/event').ReadyEmitter; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +ReadyEmitter = require('limn/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 64ddb6c..4540cea 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('kraken/util'), _ = _ref._, op = _ref.op; -ChartType = require('kraken/chart/chart-type').ChartType; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +ChartType = require('limn/chart/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 c6c5867..f456f80 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('kraken/util'), _ = _ref._, op = _ref.op; -D3ChartElement = require('kraken/chart/type/d3/d3-chart-element').D3ChartElement; -_fmt = require('kraken/util/formatters'); +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +D3ChartElement = require('limn/chart/type/d3/d3-chart-element').D3ChartElement; +_fmt = require('limn/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 c0458f7..b922b97 100644 --- a/lib/chart/type/d3/d3-line-element.mod.js +++ b/lib/chart/type/d3/d3-line-element.mod.js @@ -1,11 +1,11 @@ -require.define('/node_modules/kraken/chart/type/d3/d3-line-element.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/chart/type/d3/d3-line-element.js', function(require, module, exports, __dirname, __filename, undefined){ var d3, ColorBrewer, op, D3ChartElement, root, LineChartElement, _ref, _, _fmt; d3 = require('d3'); ColorBrewer = require('colorbrewer'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -D3ChartElement = require('kraken/chart/type/d3/d3-chart-element').D3ChartElement; -_fmt = require('kraken/util/formatters'); +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +D3ChartElement = require('limn/chart/type/d3/d3-chart-element').D3ChartElement; +_fmt = require('limn/util/formatters'); root = function(){ return this; }(); diff --git a/lib/chart/type/d3/index.js b/lib/chart/type/d3/index.js index c1193b7..76a5a17 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('kraken/chart/type/d3/d3-chart-element'); -line = require('kraken/chart/type/d3/d3-line-element'); -bar = require('kraken/chart/type/d3/d3-bar-element'); +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'); __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 9c2a284..7791108 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/kraken/chart/type/d3/index.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/chart/type/d3.js', function(require, module, exports, __dirname, __filename, undefined){ var d3chart, line, bar; -d3chart = require('kraken/chart/type/d3/d3-chart-element'); -line = require('kraken/chart/type/d3/d3-line-element'); -bar = require('kraken/chart/type/d3/d3-bar-element'); +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'); __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 59865da..681c599 100644 --- a/lib/chart/type/dygraphs.js +++ b/lib/chart/type/dygraphs.js @@ -1,6 +1,6 @@ var ChartType, DygraphsChartType, _; -_ = require('kraken/util/underscore'); -ChartType = require('kraken/chart/chart-type').ChartType; +_ = require('limn/util/underscore'); +ChartType = require('limn/chart/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 68e7d1f..70b7821 100644 --- a/lib/chart/type/dygraphs.mod.js +++ b/lib/chart/type/dygraphs.mod.js @@ -1,8 +1,8 @@ -require.define('/node_modules/kraken/chart/type/dygraphs.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/chart/type/dygraphs.js', function(require, module, exports, __dirname, __filename, undefined){ var ChartType, DygraphsChartType, _; -_ = require('kraken/util/underscore'); -ChartType = require('kraken/chart/chart-type').ChartType; +_ = require('limn/util/underscore'); +ChartType = require('limn/chart/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 c1940bf..ac2813f 100644 --- a/lib/chart/type/index.mod.js +++ b/lib/chart/type/index.mod.js @@ -1,4 +1,4 @@ -require.define('/node_modules/kraken/chart/type/index.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/chart/type.js', function(require, module, exports, __dirname, __filename, undefined){ diff --git a/lib/dashboard/dashboard-model.js b/lib/dashboard/dashboard-model.js index 8e26e25..5307c4c 100644 --- a/lib/dashboard/dashboard-model.js +++ b/lib/dashboard/dashboard-model.js @@ -1,7 +1,8 @@ -var op, BaseModel, Graph, GraphList, Dashboard, _ref, _; -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -BaseModel = require('kraken/base').BaseModel; -_ref = require('kraken/graph/graph-model'), Graph = _ref.Graph, GraphList = _ref.GraphList; +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; /** * @class */ diff --git a/lib/dashboard/dashboard-model.mod.js b/lib/dashboard/dashboard-model.mod.js index 7e61eb7..ba65ca3 100644 --- a/lib/dashboard/dashboard-model.mod.js +++ b/lib/dashboard/dashboard-model.mod.js @@ -1,9 +1,10 @@ -require.define('/node_modules/kraken/dashboard/dashboard-model.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/dashboard/dashboard-model.js', function(require, module, exports, __dirname, __filename, undefined){ -var op, BaseModel, Graph, GraphList, Dashboard, _ref, _; -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -BaseModel = require('kraken/base').BaseModel; -_ref = require('kraken/graph/graph-model'), Graph = _ref.Graph, GraphList = _ref.GraphList; +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; /** * @class */ diff --git a/lib/dashboard/dashboard-view.js b/lib/dashboard/dashboard-view.js index 37b4d79..7f572b9 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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseView = _ref.BaseView; -_ref = require('kraken/graph'), Graph = _ref.Graph, GraphList = _ref.GraphList, GraphDisplayView = _ref.GraphDisplayView; -Dashboard = require('kraken/dashboard/dashboard-model').Dashboard; +_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; /** * @class */ @@ -11,7 +11,7 @@ DashboardView = exports.DashboardView = BaseView.extend({ __bind__: ['addTab'], tagName: 'section', className: 'dashboard', - template: require('kraken/template/dashboard/dashboard'), + template: require('limn/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('kraken/template/dashboard/dashboard-tab'), + template: require('limn/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 cc0228a..3aade19 100644 --- a/lib/dashboard/dashboard-view.mod.js +++ b/lib/dashboard/dashboard-view.mod.js @@ -1,11 +1,11 @@ -require.define('/node_modules/kraken/dashboard/dashboard-view.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/dashboard/dashboard-view.js', function(require, module, exports, __dirname, __filename, undefined){ var Seq, op, BaseModel, BaseView, Graph, GraphList, GraphDisplayView, Dashboard, DashboardView, DashboardTabView, _ref, _; Seq = require('seq'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseView = _ref.BaseView; -_ref = require('kraken/graph'), Graph = _ref.Graph, GraphList = _ref.GraphList, GraphDisplayView = _ref.GraphDisplayView; -Dashboard = require('kraken/dashboard/dashboard-model').Dashboard; +_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; /** * @class */ @@ -13,7 +13,7 @@ DashboardView = exports.DashboardView = BaseView.extend({ __bind__: ['addTab'], tagName: 'section', className: 'dashboard', - template: require('kraken/template/dashboard/dashboard'), + template: require('limn/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('kraken/template/dashboard/dashboard-tab'), + template: require('limn/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 078918a..21910cb 100644 --- a/lib/dashboard/index.js +++ b/lib/dashboard/index.js @@ -1,6 +1,6 @@ var models, views; -models = require('kraken/dashboard/dashboard-model'); -views = require('kraken/dashboard/dashboard-view'); +models = require('limn/dashboard/dashboard-model'); +views = require('limn/dashboard/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 5471d02..8020112 100644 --- a/lib/dashboard/index.mod.js +++ b/lib/dashboard/index.mod.js @@ -1,8 +1,8 @@ -require.define('/node_modules/kraken/dashboard/index.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/dashboard.js', function(require, module, exports, __dirname, __filename, undefined){ var models, views; -models = require('kraken/dashboard/dashboard-model'); -views = require('kraken/dashboard/dashboard-view'); +models = require('limn/dashboard/dashboard-model'); +views = require('limn/dashboard/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 08e1688..2d52977 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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base'), BaseView = _ref.BaseView, ViewList = _ref.ViewList; -DataSetView = require('kraken/data/dataset-view').DataSetView; -MetricEditView = require('kraken/data/metric-edit-view').MetricEditView; -DataSource = require('kraken/data/datasource-model').DataSource; +_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; /** * @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('kraken/template/data/data'), + template: require('limn/template/data/data'), datasources: null /** * @constructor diff --git a/lib/data/data-view.mod.js b/lib/data/data-view.mod.js index 73e06f5..1507b09 100644 --- a/lib/data/data-view.mod.js +++ b/lib/data/data-view.mod.js @@ -1,12 +1,12 @@ -require.define('/node_modules/kraken/data/data-view.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/data/data-view.js', function(require, module, exports, __dirname, __filename, undefined){ var Seq, op, BaseView, ViewList, DataSetView, MetricEditView, DataSource, DataView, _ref, _; Seq = require('seq'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base'), BaseView = _ref.BaseView, ViewList = _ref.ViewList; -DataSetView = require('kraken/data/dataset-view').DataSetView; -MetricEditView = require('kraken/data/metric-edit-view').MetricEditView; -DataSource = require('kraken/data/datasource-model').DataSource; +_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; /** * @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('kraken/template/data/data'), + template: require('limn/template/data/data'), datasources: null /** * @constructor diff --git a/lib/data/dataset-model.js b/lib/data/dataset-model.js index 2f75baa..c9b1045 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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; -_ref = require('kraken/data/metric-model'), Metric = _ref.Metric, MetricList = _ref.MetricList; -_ref = require('kraken/data/datasource-model'), DataSource = _ref.DataSource, DataSourceList = _ref.DataSourceList; +_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; /** * @class */ diff --git a/lib/data/dataset-model.mod.js b/lib/data/dataset-model.mod.js index f3c47b1..e32a638 100644 --- a/lib/data/dataset-model.mod.js +++ b/lib/data/dataset-model.mod.js @@ -1,12 +1,12 @@ -require.define('/node_modules/kraken/data/dataset-model.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/data/dataset-model.js', function(require, module, exports, __dirname, __filename, undefined){ var Seq, ColorBrewer, op, BaseModel, BaseList, Metric, MetricList, DataSource, DataSourceList, DataSet, _ref, _; Seq = require('seq'); ColorBrewer = require('colorbrewer'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; -_ref = require('kraken/data/metric-model'), Metric = _ref.Metric, MetricList = _ref.MetricList; -_ref = require('kraken/data/datasource-model'), DataSource = _ref.DataSource, DataSourceList = _ref.DataSourceList; +_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; /** * @class */ diff --git a/lib/data/dataset-view.js b/lib/data/dataset-view.js index d1296fd..da7bab3 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('kraken/util'), _ = _ref._, op = _ref.op; -BaseView = require('kraken/base').BaseView; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +BaseView = require('limn/base').BaseView; /** * @class */ DataSetView = exports.DataSetView = BaseView.extend({ tagName: 'section', className: 'dataset-ui dataset', - template: require('kraken/template/data/dataset'), + template: require('limn/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('kraken/template/data/dataset-metric'), + template: require('limn/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 b5aec94..09462e5 100644 --- a/lib/data/dataset-view.mod.js +++ b/lib/data/dataset-view.mod.js @@ -1,15 +1,15 @@ -require.define('/node_modules/kraken/data/dataset-view.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/data/dataset-view.js', function(require, module, exports, __dirname, __filename, undefined){ var op, BaseView, DataSetView, DataSetMetricView, _ref, _; -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -BaseView = require('kraken/base').BaseView; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +BaseView = require('limn/base').BaseView; /** * @class */ DataSetView = exports.DataSetView = BaseView.extend({ tagName: 'section', className: 'dataset-ui dataset', - template: require('kraken/template/data/dataset'), + template: require('limn/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('kraken/template/data/dataset-metric'), + template: require('limn/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 8b72068..84b3c78 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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/util/timeseries'), TimeSeriesData = _ref.TimeSeriesData, CSVData = _ref.CSVData; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, ModelCache = _ref.ModelCache; -_ref = require('kraken/data/metric-model'), Metric = _ref.Metric, MetricList = _ref.MetricList; +_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; /** * @class */ diff --git a/lib/data/datasource-model.mod.js b/lib/data/datasource-model.mod.js index 49b9f7e..2155d0c 100644 --- a/lib/data/datasource-model.mod.js +++ b/lib/data/datasource-model.mod.js @@ -1,10 +1,10 @@ -require.define('/node_modules/kraken/data/datasource-model.js.js', function(require, module, exports, __dirname, __filename, undefined){ +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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/util/timeseries'), TimeSeriesData = _ref.TimeSeriesData, CSVData = _ref.CSVData; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, ModelCache = _ref.ModelCache; -_ref = require('kraken/data/metric-model'), Metric = _ref.Metric, MetricList = _ref.MetricList; +_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; /** * @class */ diff --git a/lib/data/datasource-ui-view.js b/lib/data/datasource-ui-view.js index 0f2b4c7..9328f8a 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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('limn/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('kraken/template/data/datasource-ui'), + template: require('limn/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 b9714f7..e5a57d4 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/kraken/data/datasource-ui-view.js.js', function(require, module, exports, __dirname, __filename, undefined){ +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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('limn/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('kraken/template/data/datasource-ui'), + template: require('limn/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 3ec50e1..0088fc1 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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('limn/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('kraken/template/data/datasource'), + template: require('limn/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 7f9c205..0adff99 100644 --- a/lib/data/datasource-view.mod.js +++ b/lib/data/datasource-view.mod.js @@ -1,8 +1,8 @@ -require.define('/node_modules/kraken/data/datasource-view.js.js', function(require, module, exports, __dirname, __filename, undefined){ +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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, BaseView = _ref.BaseView; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('limn/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('kraken/template/data/datasource'), + template: require('limn/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 55cb2d2..4eb1308 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('kraken/data/metric-model'); -metric_edit_view = require('kraken/data/metric-edit-view'); -datasource_model = require('kraken/data/datasource-model'); -datasource_view = require('kraken/data/datasource-view'); -datasource_ui_view = require('kraken/data/datasource-ui-view'); -dataset_model = require('kraken/data/dataset-model'); -dataset_view = require('kraken/data/dataset-view'); -data_view = require('kraken/data/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'); __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 ba4ef66..1ddf4c1 100644 --- a/lib/data/index.mod.js +++ b/lib/data/index.mod.js @@ -1,14 +1,14 @@ -require.define('/node_modules/kraken/data/index.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/data.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('kraken/data/metric-model'); -metric_edit_view = require('kraken/data/metric-edit-view'); -datasource_model = require('kraken/data/datasource-model'); -datasource_view = require('kraken/data/datasource-view'); -datasource_ui_view = require('kraken/data/datasource-ui-view'); -dataset_model = require('kraken/data/dataset-model'); -dataset_view = require('kraken/data/dataset-view'); -data_view = require('kraken/data/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'); __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 15f7c78..af85b30 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('kraken/util'), _ = _ref._, op = _ref.op; -BaseView = require('kraken/base').BaseView; -Metric = require('kraken/data/metric-model').Metric; -DataSourceUIView = require('kraken/data/datasource-ui-view').DataSourceUIView; +_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; /** * @class * Model is a Metric. @@ -11,7 +11,7 @@ MetricEditView = exports.MetricEditView = BaseView.extend({ __bind__: ['onChange'], tagName: 'section', className: 'metric-edit-ui', - template: require('kraken/template/data/metric-edit'), + template: require('limn/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 40d5442..0218ba0 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/kraken/data/metric-edit-view.js.js', function(require, module, exports, __dirname, __filename, undefined){ +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('kraken/util'), _ = _ref._, op = _ref.op; -BaseView = require('kraken/base').BaseView; -Metric = require('kraken/data/metric-model').Metric; -DataSourceUIView = require('kraken/data/datasource-ui-view').DataSourceUIView; +_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; /** * @class * Model is a Metric. @@ -13,7 +13,7 @@ MetricEditView = exports.MetricEditView = BaseView.extend({ __bind__: ['onChange'], tagName: 'section', className: 'metric-edit-ui', - template: require('kraken/template/data/metric-edit'), + template: require('limn/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 c304e53..853c213 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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; -ProjectColors = require('kraken/data/project-colors'); +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +ProjectColors = require('limn/data/project-colors'); DataSource = DataSourceList = null; /** * @class @@ -176,5 +176,5 @@ MetricList = exports.MetricList = BaseList.extend({ }); setTimeout(function(){ var _ref; - return _ref = require('kraken/data/datasource-model'), DataSource = _ref.DataSource, DataSourceList = _ref.DataSourceList, _ref; + return _ref = require('limn/data/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 831825b..053b7f5 100644 --- a/lib/data/metric-model.mod.js +++ b/lib/data/metric-model.mod.js @@ -1,9 +1,9 @@ -require.define('/node_modules/kraken/data/metric-model.js.js', function(require, module, exports, __dirname, __filename, undefined){ +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('kraken/util'), _ = _ref._, op = _ref.op; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; -ProjectColors = require('kraken/data/project-colors'); +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +_ref = require('limn/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList; +ProjectColors = require('limn/data/project-colors'); DataSource = DataSourceList = null; /** * @class @@ -178,7 +178,7 @@ MetricList = exports.MetricList = BaseList.extend({ }); setTimeout(function(){ var _ref; - return _ref = require('kraken/data/datasource-model'), DataSource = _ref.DataSource, DataSourceList = _ref.DataSourceList, _ref; + return _ref = require('limn/data/datasource-model'), DataSource = _ref.DataSource, DataSourceList = _ref.DataSourceList, _ref; }, 10); }); diff --git a/lib/data/project-colors.mod.js b/lib/data/project-colors.mod.js index 674a936..c6dd05d 100644 --- a/lib/data/project-colors.mod.js +++ b/lib/data/project-colors.mod.js @@ -1,4 +1,4 @@ -require.define('/node_modules/kraken/data/project-colors.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/data/project-colors.js', function(require, module, exports, __dirname, __filename, undefined){ /** * @fileOverview Applies consistent coloring to language/project Metrics with a null `color` field. diff --git a/lib/graph/graph-display-view.js b/lib/graph/graph-display-view.js index ed4246f..fdafaeb 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('kraken/util'), _ = _ref._, op = _ref.op; -Graph = require('kraken/graph/graph-model').Graph; -GraphView = require('kraken/graph/graph-view').GraphView; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +Graph = require('limn/graph/graph-model').Graph; +GraphView = require('limn/graph/graph-view').GraphView; root = function(){ return this; }(); @@ -12,14 +12,14 @@ root = function(){ GraphDisplayView = exports.GraphDisplayView = GraphView.extend({ tagName: 'section', className: 'graph graph-display', - template: require('kraken/template/graph/graph-display'), + template: require('limn/template/graph/graph-display'), events: { 'focus .graph-permalink input': 'onPermalinkFocus', 'click .export-button': 'exportChart' }, constructor: (function(){ function GraphDisplayView(){ - return BaseView.apply(this, arguments); + return GraphView.apply(this, arguments); } return GraphDisplayView; }()), diff --git a/lib/graph/graph-display-view.mod.js b/lib/graph/graph-display-view.mod.js index 76919e9..64bd1c7 100644 --- a/lib/graph/graph-display-view.mod.js +++ b/lib/graph/graph-display-view.mod.js @@ -1,10 +1,10 @@ -require.define('/node_modules/kraken/graph/graph-display-view.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/graph/graph-display-view.js', function(require, module, exports, __dirname, __filename, undefined){ var moment, op, Graph, GraphView, root, GraphDisplayView, _ref, _; moment = require('moment'); -_ref = require('kraken/util'), _ = _ref._, op = _ref.op; -Graph = require('kraken/graph/graph-model').Graph; -GraphView = require('kraken/graph/graph-view').GraphView; +_ref = require('limn/util'), _ = _ref._, op = _ref.op; +Graph = require('limn/graph/graph-model').Graph; +GraphView = require('limn/graph/graph-view').GraphView; root = function(){ return this; }(); @@ -14,14 +14,14 @@ root = function(){ GraphDisplayView = exports.GraphDisplayView = GraphView.extend({ tagName: 'section', className: 'graph graph-display', - template: require('kraken/template/graph/graph-display'), + template: require('limn/template/graph/graph-display'), events: { 'focus .graph-permalink input': 'onPermalinkFocus', 'click .export-button': 'exportChart' }, constructor: (function(){ function GraphDisplayView(){ - return BaseView.apply(this, arguments); + return GraphView.apply(this, arguments); } return GraphDisplayView; }()), diff --git a/lib/graph/graph-edit-view.js b/lib/graph/graph-edit-view.js index 2a562eb..9551a9b 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('kraken/util/underscore'); -Graph = require('kraken/graph/graph-model').Graph; -GraphView = require('kraken/graph/graph-view').GraphView; -_ref = require('kraken/chart'), ChartOptionScaffold = _ref.ChartOptionScaffold, DEBOUNCE_RENDER = _ref.DEBOUNCE_RENDER; -_ref = require('kraken/data'), DataView = _ref.DataView, DataSetView = _ref.DataSetView, DataSet = _ref.DataSet; +_ = 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; 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('kraken/template/graph/graph-edit'), + template: require('limn/template/graph/graph-edit'), events: { 'click .redraw-button': 'stopAndRender', 'click .load-button': 'load', @@ -30,9 +30,16 @@ GraphEditView = exports.GraphEditView = GraphView.extend({ 'submit form.chart-options': 'onOptionsSubmit', 'change .chart-options input[type="checkbox"]': 'onOptionsSubmit' }, + routes: { + 'graphs/:graph/edit/info': 'showInfoPane', + 'graphs/:graph/edit/data/metric/:metric': 'showDataPane', + 'graphs/:graph/edit/data': 'showDataPane', + 'graphs/:graph/edit/options/:optionsFilter': 'showOptionsPane', + 'graphs/:graph/edit/options': 'showOptionsPane' + }, constructor: (function(){ function GraphEditView(){ - return BaseView.apply(this, arguments); + return GraphView.apply(this, arguments); } return GraphEditView; }()), diff --git a/lib/graph/graph-edit-view.mod.js b/lib/graph/graph-edit-view.mod.js index ed45d38..82aa5da 100644 --- a/lib/graph/graph-edit-view.mod.js +++ b/lib/graph/graph-edit-view.mod.js @@ -1,12 +1,12 @@ -require.define('/node_modules/kraken/graph/graph-edit-view.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/graph/graph-edit-view.js', function(require, module, exports, __dirname, __filename, undefined){ var moment, Graph, GraphView, ChartOptionScaffold, DEBOUNCE_RENDER, DataView, DataSetView, DataSet, root, GraphEditView, _, _ref; moment = require('moment'); -_ = require('kraken/util/underscore'); -Graph = require('kraken/graph/graph-model').Graph; -GraphView = require('kraken/graph/graph-view').GraphView; -_ref = require('kraken/chart'), ChartOptionScaffold = _ref.ChartOptionScaffold, DEBOUNCE_RENDER = _ref.DEBOUNCE_RENDER; -_ref = require('kraken/data'), DataView = _ref.DataView, DataSetView = _ref.DataSetView, DataSet = _ref.DataSet; +_ = 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; 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('kraken/template/graph/graph-edit'), + template: require('limn/template/graph/graph-edit'), events: { 'click .redraw-button': 'stopAndRender', 'click .load-button': 'load', @@ -32,9 +32,16 @@ GraphEditView = exports.GraphEditView = GraphView.extend({ 'submit form.chart-options': 'onOptionsSubmit', 'change .chart-options input[type="checkbox"]': 'onOptionsSubmit' }, + routes: { + 'graphs/:graph/edit/info': 'showInfoPane', + 'graphs/:graph/edit/data/metric/:metric': 'showDataPane', + 'graphs/:graph/edit/data': 'showDataPane', + 'graphs/:graph/edit/options/:optionsFilter': 'showOptionsPane', + 'graphs/:graph/edit/options': 'showOptionsPane' + }, constructor: (function(){ function GraphEditView(){ - return BaseView.apply(this, arguments); + return GraphView.apply(this, arguments); } return GraphEditView; }()), diff --git a/lib/graph/graph-list-view.js b/lib/graph/graph-list-view.js index 03f37e4..c5c16f5 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('kraken/util'), _ = _ref._, op = _ref.op; -BaseView = require('kraken/base').BaseView; -_ref = require('kraken/graph/graph-model'), Graph = _ref.Graph, GraphList = _ref.GraphList; +_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; root = function(){ return this; }(); @@ -14,12 +14,19 @@ GraphListView = exports.GraphListView = BaseView.extend({ __debounce__: ['render'], tagName: 'section', className: 'graph-list-view', - template: require('kraken/template/graph/graph-list'), + template: require('limn/template/graph/graph-list'), data: {}, ready: false, initialize: function(){ this.model = this.collection || (this.collection = new GraphList); - return BaseView.prototype.initialize.apply(this, arguments); + BaseView.prototype.initialize.apply(this, arguments); + return this.collection.once('load-success', this.onLoad, this).load(); + }, + onLoad: function(){ + console.log(this + ".onLoad!"); + this.triggerReady(); + this.isBuilt = false; + return this.render(); }, toTemplateLocals: function(){ var locals; diff --git a/lib/graph/graph-list-view.mod.js b/lib/graph/graph-list-view.mod.js index b943a49..caf8621 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/kraken/graph/graph-list-view.js.js', function(require, module, exports, __dirname, __filename, undefined){ +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('kraken/util'), _ = _ref._, op = _ref.op; -BaseView = require('kraken/base').BaseView; -_ref = require('kraken/graph/graph-model'), Graph = _ref.Graph, GraphList = _ref.GraphList; +_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; root = function(){ return this; }(); @@ -16,12 +16,19 @@ GraphListView = exports.GraphListView = BaseView.extend({ __debounce__: ['render'], tagName: 'section', className: 'graph-list-view', - template: require('kraken/template/graph/graph-list'), + template: require('limn/template/graph/graph-list'), data: {}, ready: false, initialize: function(){ this.model = this.collection || (this.collection = new GraphList); - return BaseView.prototype.initialize.apply(this, arguments); + BaseView.prototype.initialize.apply(this, arguments); + return this.collection.once('load-success', this.onLoad, this).load(); + }, + onLoad: function(){ + console.log(this + ".onLoad!"); + this.triggerReady(); + this.isBuilt = false; + return this.render(); }, toTemplateLocals: function(){ var locals; diff --git a/lib/graph/graph-model.js b/lib/graph/graph-model.js index cf04dbd..dd6da88 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('kraken/util'), _ = _ref._, Cascade = _ref.Cascade; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, ModelCache = _ref.ModelCache; -ChartType = require('kraken/chart').ChartType; -DataSet = require('kraken/data').DataSet; +_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; root = function(){ return this; }(); diff --git a/lib/graph/graph-model.mod.js b/lib/graph/graph-model.mod.js index 3953385..725d971 100644 --- a/lib/graph/graph-model.mod.js +++ b/lib/graph/graph-model.mod.js @@ -1,11 +1,11 @@ -require.define('/node_modules/kraken/graph/graph-model.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/graph/graph-model.js', function(require, module, exports, __dirname, __filename, undefined){ var Seq, Cascade, BaseModel, BaseList, ModelCache, ChartType, DataSet, root, Graph, GraphList, _ref, _; Seq = require('seq'); -_ref = require('kraken/util'), _ = _ref._, Cascade = _ref.Cascade; -_ref = require('kraken/base'), BaseModel = _ref.BaseModel, BaseList = _ref.BaseList, ModelCache = _ref.ModelCache; -ChartType = require('kraken/chart').ChartType; -DataSet = require('kraken/data').DataSet; +_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; root = function(){ return this; }(); diff --git a/lib/graph/graph-view.js b/lib/graph/graph-view.js index 7c98892..19664e6 100644 --- a/lib/graph/graph-view.js +++ b/lib/graph/graph-view.js @@ -1,8 +1,9 @@ -var moment, BaseView, Graph, root, DEBOUNCE_RENDER, GraphView, _; +var Seq, moment, BaseView, Graph, root, DEBOUNCE_RENDER, GraphView, _; +Seq = require('seq'); moment = require('moment'); -_ = require('kraken/util/underscore'); -BaseView = require('kraken/base').BaseView; -Graph = require('kraken/graph/graph-model').Graph; +_ = require('limn/util/underscore'); +BaseView = require('limn/base').BaseView; +Graph = require('limn/graph/graph-model').Graph; root = function(){ return this; }(); diff --git a/lib/graph/graph-view.mod.js b/lib/graph/graph-view.mod.js index c3bf4cb..baf0165 100644 --- a/lib/graph/graph-view.mod.js +++ b/lib/graph/graph-view.mod.js @@ -1,10 +1,11 @@ -require.define('/node_modules/kraken/graph/graph-view.js.js', function(require, module, exports, __dirname, __filename, undefined){ +require.define('/node_modules/limn/graph/graph-view.js', function(require, module, exports, __dirname, __filename, undefined){ -var moment, BaseView, Graph, root, DEBOUNCE_RENDER, GraphView, _; +var Seq, moment, BaseView, Graph, root, DEBOUNCE_RENDER, GraphView, _; +Seq = require('seq'); moment = require('moment'); -_ = require('kraken/util/underscore'); -BaseView = require('kraken/base').BaseView; -Graph = require('kraken/graph/graph-model').Graph; +_ = require('limn/util/underscore'); +BaseView = require('limn/base').BaseView; +Graph = require('limn/graph/graph-model').Graph; root = function(){ return this; }(); diff --git a/lib/graph/index.js b/lib/graph/index.js index 8817c26..0247b67 100644 --- a/lib/graph/index.js +++ b/lib/graph/index.js @@ -1,9 +1,9 @@ var models, base_view