kraken/{ -> util/}underscore

diff --git a/lib/base.co b/lib/base.co
index f1e6235..4d34594 100644 (file)
--- a/lib/base.co
+++ b/lib/base.co
@@ -1,4 +1,4 @@
-_  = require 'kraken/underscore'
+_  = require 'kraken/util/underscore'
 op = require 'kraken/util/op'
 
 Backbone = require 'backbone'

diff --git a/lib/chart/chart-library.co b/lib/chart/chart-library.co
index dee4ece..75c7a13 100644 (file)
--- a/lib/chart/chart-library.co
+++ b/lib/chart/chart-library.co
@@ -1,4 +1,4 @@
-_  = require 'kraken/underscore'
+_  = require 'kraken/util/underscore'
 op = require 'kraken/util/op'
 {EventEmitter} = require 'events'
 {Parsers, ParserMixin}  = require 'kraken/util/parser'

diff --git a/lib/chart/dygraphs-library.co b/lib/chart/dygraphs-library.co
index 2487107..f08468d 100644 (file)
--- a/lib/chart/dygraphs-library.co
+++ b/lib/chart/dygraphs-library.co
@@ -1,4 +1,4 @@
-_ = require 'kraken/underscore'
+_ = require 'kraken/util/underscore'
 { ChartLibrary, ChartOption,
 } = require 'kraken/chart/chart-library'
 

diff --git a/lib/graph/graph-model.co b/lib/graph/graph-model.co
index 5df59fd..39e1109 100644 (file)
--- a/lib/graph/graph-model.co
+++ b/lib/graph/graph-model.co
@@ -1,4 +1,4 @@
-_ = require 'kraken/underscore'
+_ = require 'kraken/util/underscore'
 { BaseModel, BaseView,
 } = require 'kraken/base'
 { Field, FieldList, FieldView, Scaffold,

diff --git a/lib/graph/graph-view.co b/lib/graph/graph-view.co
index 0cb3982..ad07954 100644 (file)
--- a/lib/graph/graph-view.co
+++ b/lib/graph/graph-view.co
@@ -1,4 +1,4 @@
-_ = require 'kraken/underscore'
+_ = require 'kraken/util/underscore'
 {BaseView} = require 'kraken/base'
 { Field, FieldList, FieldView, Scaffold,
 } = require 'kraken/scaffold'

diff --git a/lib/scaffold/scaffold-model.co b/lib/scaffold/scaffold-model.co
index 9d242a6..eda72ed 100644 (file)
--- a/lib/scaffold/scaffold-model.co
+++ b/lib/scaffold/scaffold-model.co
@@ -1,4 +1,4 @@
-_  = require 'kraken/underscore'
+_  = require 'kraken/util/underscore'
 op = require 'kraken/util/op'
 { BaseModel, BaseList,
 }  = require 'kraken/base'

diff --git a/lib/scaffold/scaffold-view.co b/lib/scaffold/scaffold-view.co
index a766afb..21aa194 100644 (file)
--- a/lib/scaffold/scaffold-view.co
+++ b/lib/scaffold/scaffold-view.co
@@ -1,4 +1,4 @@
-_  = require 'kraken/underscore'
+_  = require 'kraken/util/underscore'
 op = require 'kraken/util/op'
 { BaseView,
 }  = require 'kraken/base'

diff --git a/lib/util/aliasdict.co b/lib/util/aliasdict.co
index 81cb4ef..4df93b6 100644 (file)
--- a/lib/util/aliasdict.co
+++ b/lib/util/aliasdict.co
@@ -1,4 +1,4 @@
-_ = require 'kraken/underscore'
+_ = require 'kraken/util/underscore'
 
 /**
  * @class A mapping of key-value pairs supporting key-aliases.

diff --git a/lib/util/cascade.co b/lib/util/cascade.co
index f0c47e4..38847ff 100644 (file)
--- a/lib/util/cascade.co
+++ b/lib/util/cascade.co
@@ -1,4 +1,4 @@
-_ = require 'kraken/underscore'
+_ = require 'kraken/util/underscore'
 
 hasOwn = ({}).hasOwnProperty
 

diff --git a/lib/util/index.co b/lib/util/index.co
index 2cc39e1..caba6e5 100644 (file)
--- a/lib/util/index.co
+++ b/lib/util/index.co
@@ -1,4 +1,4 @@
-_  = require 'kraken/underscore'
+_  = require 'kraken/util/underscore'
 
 root = do -> this
 root.console or= _ <[ log info warn error dir table group groupCollapsed groupEnd ]> .synthesize -> [it, nop]
@@ -10,11 +10,10 @@ root.jQuery?.fn.invoke = (method, ...args) ->
 
 op        = require 'kraken/util/op'
 backbone  = require 'kraken/util/backbone'
+parser    = require 'kraken/util/parser'
+exports import { root, _, op, backbone, parser, }
+
 # HashSet   = require 'kraken/util/hashset'
 # BitString = require 'kraken/util/bitstring'
 # {crc32}   = require 'kraken/util/crc'
-parser    = require 'kraken/util/parser'
-
-
-exports import { root, _, op, backbone, parser, }
-# exports import { root, _, op, HashSet, BitString, crc32, parser, }
+# exports import { HashSet, BitString, crc32, }

diff --git a/lib/util/parser.co b/lib/util/parser.co
index e1f9744..abcb0ea 100644 (file)
--- a/lib/util/parser.co
+++ b/lib/util/parser.co
@@ -1,4 +1,4 @@
-_  = require 'kraken/underscore'
+_  = require 'kraken/util/underscore'
 op = require 'kraken/util/op'
 
 

diff --git a/lib/underscore/array.co b/lib/util/underscore/array.co
similarity index 100%
rename from lib/underscore/array.co
rename to lib/util/underscore/array.co

diff --git a/lib/underscore/functions.co b/lib/util/underscore/functions.co
similarity index 100%
rename from lib/underscore/functions.co
rename to lib/util/underscore/functions.co

diff --git a/lib/underscore/index.co b/lib/util/underscore/index.co
similarity index 65%
rename from lib/underscore/index.co
rename to lib/util/underscore/index.co
index ed3d85a..7e57eef 100644 (file)
--- a/lib/underscore/index.co
+++ b/lib/util/underscore/index.co
@@ -2,10 +2,10 @@ _     = require 'underscore'
 _.str = require 'underscore.string'
 _.mixin _.str.exports()
 
-_.mixin require 'kraken/underscore/array'
-_.mixin require 'kraken/underscore/object'
-_.mixin require 'kraken/underscore/kv'
-_.mixin require 'kraken/underscore/string'
+_.mixin require 'kraken/util/underscore/array'
+_.mixin require 'kraken/util/underscore/object'
+_.mixin require 'kraken/util/underscore/kv'
+_.mixin require 'kraken/util/underscore/string'
 
 
 ## Debug

diff --git a/lib/underscore/kv.co b/lib/util/underscore/kv.co
similarity index 100%
rename from lib/underscore/kv.co
rename to lib/util/underscore/kv.co

diff --git a/lib/underscore/object.co b/lib/util/underscore/object.co
similarity index 100%
rename from lib/underscore/object.co
rename to lib/util/underscore/object.co

diff --git a/lib/underscore/string.co b/lib/util/underscore/string.co
similarity index 100%
rename from lib/underscore/string.co
rename to lib/util/underscore/string.co

diff --git a/lib/vis/vis-model.co b/lib/vis/vis-model.co
index 20929f1..1ec02e8 100644 (file)
--- a/lib/vis/vis-model.co
+++ b/lib/vis/vis-model.co
@@ -1,6 +1,6 @@
 Seq = require 'seq'
 
-_ = require 'kraken/underscore'
+_ = require 'kraken/util/underscore'
 Cascade = require 'kraken/util/cascade'
 { ChartLibrary,
 } = require 'kraken/chart'

diff --git a/lib/vis/vis-view.co b/lib/vis/vis-view.co
index 7ca9cec..40a7e89 100644 (file)
--- a/lib/vis/vis-view.co
+++ b/lib/vis/vis-view.co
@@ -1,6 +1,6 @@
 root = do -> this
 
-_ = require 'kraken/underscore'
+_ = require 'kraken/util/underscore'
 { BaseView,
 } = require 'kraken/base'
 { Field, FieldList, FieldView, Scaffold

diff --git a/test/util/cascade-test.co b/test/util/cascade-test.co
index 4524bf2..253d3c2 100644 (file)
--- a/test/util/cascade-test.co
+++ b/test/util/cascade-test.co
@@ -1,6 +1,6 @@
 assert  = require 'assert'
 
-_       = require 'kraken/underscore'
+_       = require 'kraken/util/underscore'
 Cascade = require 'kraken/util/cascade'
 
 

diff --git a/www/misc/numbers.co b/www/misc/numbers.co
index 36bff8f..77c62a9 100644 (file)
--- a/www/misc/numbers.co
+++ b/www/misc/numbers.co
@@ -1,4 +1,4 @@
-_ = require 'kraken/underscore'
+_ = require 'kraken/util/underscore'
 
 config = tbody = null
 

diff --git a/www/modules.yaml b/www/modules.yaml
index ce37523..0199df8 100644 (file)
--- a/www/modules.yaml
+++ b/www/modules.yaml
@@ -44,13 +44,13 @@ dev:
     paths:
     - js:
         - kraken:
-            - underscore:
-                - array
-                - object
-                - kv
-                - string
-                - index
             - util:
+                - underscore:
+                    - array
+                    - object
+                    - kv
+                    - string
+                    - index
                 - op
                 - backbone
                 - parser