made the define() methods correctly define the module, created an ini…

…t script for deco, and got the build loading all the scripts
plone · Feb 28, 2013 · 1ce1d4e · 1ce1d4e
1 parent 6355c79
commit 1ce1d4e
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 22 deletions.
diff --git a/plone/app/deco/resources/src/Makefile b/plone/app/deco/resources/src/Makefile
@@ -33,8 +33,8 @@ deco: clean_deco $(DECO)
 	# ----------------------------------------------------------------------- #
 
 build/deco.full.js:
-	$(JAM) compile -i js/toolbar -e jquery --no-minify --almond $@
-	echo "require(['deco']);" >> $@
+	$(JAM) compile -i js/deco.init -e jquery --no-minify --almond $@
+	echo "require(['deco.init']);" >> $@
 
 build/deco.min.js: build/deco.full.js
 	$(UGLIFYJS) build/deco.full.js > $@

diff --git a/plone/app/deco/resources/src/js/deco.column.js b/plone/app/deco/resources/src/js/deco.column.js
@@ -1,7 +1,6 @@
 define(
-"deco.column",
-["jquery", "deco"],
-function($) {
+["js/deco"],
+function() {
 
   $.deco.Column = function(el) {
     var self = this;

diff --git a/plone/app/deco/resources/src/js/deco.init.js b/plone/app/deco/resources/src/js/deco.init.js
@@ -0,0 +1,5 @@
+define(
+['js/deco', 'js/deco.toolbar', 'js/deco.panel', 'js/deco.row', 'js/deco.column', 'js/deco.tile'],
+function(){
+
+});
diff --git a/plone/app/deco/resources/src/js/deco.js b/plone/app/deco/resources/src/js/deco.js
@@ -1,12 +1,10 @@
 define(
-"deco",
-["jquery"],
-function($) {
+function() {
 
   // create a namespace for deco functionality
   $.deco = {
-    NUM_GRID_COLUMNS = 12;
-  }
+    NUM_GRID_COLUMNS: 12
+  };
 
 
   $.each(['Toolbar','Panel','Row','Column','Tile'], function(i, name) {

diff --git a/plone/app/deco/resources/src/js/deco.panel.js b/plone/app/deco/resources/src/js/deco.panel.js
@@ -1,7 +1,6 @@
 define(
-"deco.panel",
-["jquery", "deco"],
-function($) {
+["js/deco"],
+function() {
 
   $.deco.Panel = function(el) {
     this.el = el;

diff --git a/plone/app/deco/resources/src/js/deco.row.js b/plone/app/deco/resources/src/js/deco.row.js
@@ -1,7 +1,6 @@
 define(
-"deco.row",
-["jquery", "deco"],
-function($) {
+["js/deco"],
+function() {
 
   $.deco.Row = function(el) {
     var self = this;

diff --git a/plone/app/deco/resources/src/js/deco.tile.js b/plone/app/deco/resources/src/js/deco.tile.js
@@ -1,7 +1,6 @@
 define(
-"deco.tile",
-["jquery", "deco"],
-function($) {
+["js/deco"],
+function() {
 
   $.deco.Tile = function(el) {
     var self = this;

diff --git a/plone/app/deco/resources/src/js/deco.toolbar.js b/plone/app/deco/resources/src/js/deco.toolbar.js
@@ -1,7 +1,6 @@
 define(
-"deco.toolbar",
-["jquery", "deco"],
-function($) {
+["js/deco"],
+function() {
 
   $.deco.Toolbar = function(el) {
     this.el = el;