summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Beauchamp <daniel.beauchamp@shopify.com>2012-07-25 01:27:52 -0400
committerDaniel Beauchamp <daniel.beauchamp@shopify.com>2012-07-25 01:27:52 -0400
commit69f36572ca81961395b85ac423c94892ef5e6df0 (patch)
tree6a92ea3b047a6029b54c280c1be2a67e1062818a
parent073ace34392d12ad789217b781b01480ce8362b0 (diff)
Prefixing all widgets with "widget"
-rwxr-xr-xbin/att2
-rw-r--r--templates/project/dashboards/main.erb2
-rw-r--r--templates/project/widgets/sample/sample.coffee2
-rw-r--r--templates/project/widgets/widget_sample/widget_sample.coffee2
-rw-r--r--templates/project/widgets/widget_sample/widget_sample.html (renamed from templates/project/widgets/sample/sample.html)0
-rw-r--r--templates/project/widgets/widget_sample/widget_sample.scss (renamed from templates/project/widgets/sample/sample.scss)0
-rw-r--r--vendor/javascripts/application.coffee6
-rw-r--r--vendor/javascripts/widget.coffee4
8 files changed, 12 insertions, 6 deletions
diff --git a/bin/att b/bin/att
index fe8db05..c90fc48 100755
--- a/bin/att
+++ b/bin/att
@@ -43,7 +43,7 @@ module AllTheThings
desc "new_widget WIDGET_NAME", "Creates a new widget with all the fixins'"
def new_widget(name)
- @name = Thor::Util.snake_case(name)
+ @name = "widget_#{Thor::Util.snake_case(name)}"
directory :widget, File.join('widgets', @name)
end
diff --git a/templates/project/dashboards/main.erb b/templates/project/dashboards/main.erb
index b6797dd..3638940 100644
--- a/templates/project/dashboards/main.erb
+++ b/templates/project/dashboards/main.erb
@@ -1 +1 @@
-<div data-id="sample" data-view="Sample"></div> \ No newline at end of file
+<div data-id="sample" data-view="WidgetSample"></div> \ No newline at end of file
diff --git a/templates/project/widgets/sample/sample.coffee b/templates/project/widgets/sample/sample.coffee
deleted file mode 100644
index cb25885..0000000
--- a/templates/project/widgets/sample/sample.coffee
+++ /dev/null
@@ -1,2 +0,0 @@
-class AllTheThings.Sample extends AllTheThings.Widget
- source: 'sample' \ No newline at end of file
diff --git a/templates/project/widgets/widget_sample/widget_sample.coffee b/templates/project/widgets/widget_sample/widget_sample.coffee
new file mode 100644
index 0000000..a1458df
--- /dev/null
+++ b/templates/project/widgets/widget_sample/widget_sample.coffee
@@ -0,0 +1,2 @@
+class AllTheThings.WidgetSample extends AllTheThings.Widget
+ source: 'widget_sample' \ No newline at end of file
diff --git a/templates/project/widgets/sample/sample.html b/templates/project/widgets/widget_sample/widget_sample.html
index eea0f1c..eea0f1c 100644
--- a/templates/project/widgets/sample/sample.html
+++ b/templates/project/widgets/widget_sample/widget_sample.html
diff --git a/templates/project/widgets/sample/sample.scss b/templates/project/widgets/widget_sample/widget_sample.scss
index e69de29..e69de29 100644
--- a/templates/project/widgets/sample/sample.scss
+++ b/templates/project/widgets/widget_sample/widget_sample.scss
diff --git a/vendor/javascripts/application.coffee b/vendor/javascripts/application.coffee
index 54050c6..d311687 100644
--- a/vendor/javascripts/application.coffee
+++ b/vendor/javascripts/application.coffee
@@ -1,6 +1,12 @@
Batman.Filters.PrettyNumber = (num) ->
num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") unless isNaN(num)
+Batman.Filters.dashize = (str) ->
+ dashes_rx1 = /([A-Z]+)([A-Z][a-z])/g;
+ dashes_rx2 = /([a-z\d])([A-Z])/g;
+
+ return str.replace(dashes_rx1, '$1_$2').replace(dashes_rx2, '$1_$2').replace('_', '-').toLowerCase();
+
class window.AllTheThings extends Batman.App
@root ->
diff --git a/vendor/javascripts/widget.coffee b/vendor/javascripts/widget.coffee
index 33c21ef..f87b9fb 100644
--- a/vendor/javascripts/widget.coffee
+++ b/vendor/javascripts/widget.coffee
@@ -7,8 +7,8 @@ class AllTheThings.Widget extends Batman.View
AllTheThings.widgets[@id].push(@)
@mixin(AllTheThings.lastEvents[@id]) # in case the events from the server came before the widget was rendered
- type = Batman.Filters.underscore(@view)
- $(@node).addClass("widget widget-#{type} #{@id}")
+ type = Batman.Filters.dashize(@view)
+ $(@node).addClass("widget #{type} #{@id}")
onData: (data) =>
@mixin(data) \ No newline at end of file