Renames model & view files to avoid having a ton named 'model.co' etc

diff --git a/lib/graph/model.co b/lib/graph/graph-model.co
similarity index 100%
rename from lib/graph/model.co
rename to lib/graph/graph-model.co

diff --git a/lib/graph/view.co b/lib/graph/graph-view.co
similarity index 98%
rename from lib/graph/view.co
rename to lib/graph/graph-view.co
index 0e32474..d507f8e 100644 (file)
--- a/lib/graph/view.co
+++ b/lib/graph/graph-view.co
@@ -3,7 +3,7 @@ _ = require 'kraken/underscore'
 { Field, FieldList, FieldView, Scaffold
 } = require 'kraken/scaffold'
 {   GraphModel, GraphOption, GraphOptionList, TagSet,
-} = require 'kraken/graph/model'
+} = require 'kraken/graph/graph-model'
 
 root = do -> this
 DEBOUNCE_RENDER = exports.DEBOUNCE_RENDER = 100ms
@@ -181,7 +181,7 @@ GraphView = exports.GraphView = BaseView.extend do # {{{
             height = @viewport.height()
         size = { width, height }
         @viewport.css size
-        console.log 'resizeViewport!', JSON.stringify size
+        console.log 'resizeViewport!', JSON.stringify(size), @viewport
         # @chart.resize size if forceRedraw
         size
     

diff --git a/lib/graph/index.co b/lib/graph/index.co
index 881b673..cd7b8be 100644 (file)
--- a/lib/graph/index.co
+++ b/lib/graph/index.co
@@ -1,3 +1,3 @@
-models = require 'kraken/graph/model'
-views  = require 'kraken/graph/view'
+models = require 'kraken/graph/graph-model'
+views  = require 'kraken/graph/graph-view'
 exports import models import views

diff --git a/lib/scaffold/index.co b/lib/scaffold/index.co
index 03f7aa7..d183e5f 100644 (file)
--- a/lib/scaffold/index.co
+++ b/lib/scaffold/index.co
@@ -1,3 +1,3 @@
-models = require 'kraken/scaffold/model'
-views  = require 'kraken/scaffold/view'
+models = require 'kraken/scaffold/scaffold-model'
+views  = require 'kraken/scaffold/scaffold-view'
 exports import models import views

diff --git a/lib/scaffold/model.co b/lib/scaffold/scaffold-model.co
similarity index 100%
rename from lib/scaffold/model.co
rename to lib/scaffold/scaffold-model.co

diff --git a/lib/scaffold/view.co b/lib/scaffold/scaffold-view.co
similarity index 98%
rename from lib/scaffold/view.co
rename to lib/scaffold/scaffold-view.co
index b16cceb..12a46dd 100644 (file)
--- a/lib/scaffold/view.co
+++ b/lib/scaffold/scaffold-view.co
@@ -2,7 +2,7 @@ _          = require 'kraken/underscore'
 op         = require 'kraken/util/op'
 {BaseView} = require 'kraken/base'
 { Field, FieldList,
-}          = require 'kraken/scaffold/model'
+}          = require 'kraken/scaffold/scaffold-model'
 
 
 FieldView = exports.FieldView = BaseView.extend do # {{{

diff --git a/www/modules.yaml b/www/modules.yaml
index 4a56d7d..a35ef90 100644 (file)
--- a/www/modules.yaml
+++ b/www/modules.yaml
@@ -40,12 +40,12 @@ all:
                 - graph.jade
                 - graph-option.jade
             - scaffold:
-                - model
-                - view
+                - scaffold-model
+                - scaffold-view
                 - index
             - graph:
-                - model
-                - view
+                - graph-model
+                - graph-view
                 - index