diff --git a/.gitignore b/.gitignore
index 20ffecc9..96adf415 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
.tmp*
-dist/*
\ No newline at end of file
+dist
+*.swp
diff --git a/README b/README
index 53e1f111..f5535b09 100644
--- a/README
+++ b/README
@@ -10,15 +10,16 @@ A. How to get (and contribute) JMVC
http://github.com/jupiterjs/steal and
http://github.com/jupiterjs/jquerymx
- 3. Add steal and javascriptmvc as submodules of your project...
+ 3. Add steal and jquerymx as submodules of your project...
git submodule add git@github.com:_YOU_/steal.git steal
- git submodule add git@github.com:_YOU_/javascriptmvc.git jquery
+ git submodule add git@github.com:_YOU_/jquerymx.git jquery
- * Notice javascriptmvc is under the jquery folder
+ * Notice jquerymx is under the jquery folder
4. Learn a little more about submodules ...
http://johnleach.co.uk/words/archives/2008/10/12/323/git-submodules-in-n-easy-steps
- 5. Make changes in steal or jmvc, and push them back to your fork.
+ 5. Make changes in steal or jquerymx, and push them back to your fork.
6. Make a pull request to your fork.
+
diff --git a/build.js b/build.js
index 89aeb6dd..1d840746 100644
--- a/build.js
+++ b/build.js
@@ -1,8 +1,10 @@
-load('steal/rhino/steal.js')
+// load('jquery/build.js')
+
+load('steal/rhino/rhino.js')
var i, fileName, cmd,
plugins = [
- "class",
+ "class" ,
"controller",
{
plugin: "controller/subscribe",
@@ -14,6 +16,8 @@ var i, fileName, cmd,
"event/default",
"event/destroyed",
"event/drag",
+ "event/pause",
+ "event/resize",
{
plugin: "event/drag/limit",
exclude: ["jquery/lang/vector/vector.js", "jquery/event/livehack/livehack.js", "jquery/event/drag/drag.js"]},
@@ -36,14 +40,6 @@ var i, fileName, cmd,
"dom/within",
"dom/cur_styles",
"model",
- {
- plugin: "model/associations",
- exclude: ["jquery/class/class.js",
- "jquery/lang/lang.js",
- "jquery/event/destroyed/destroyed.js",
- "jquery/lang/openajax/openajax.js",
- "jquery/model/model.js"]
- },
{
plugin: "model/backup",
exclude: ["jquery/class/class.js",
@@ -94,7 +90,8 @@ var i, fileName, cmd,
]
-steal('//steal/build/pluginify', function(s){
+steal.File('jquery/dist').mkdir();
+steal('steal/build/pluginify').then( function(s){
var plugin, exclude, fileDest, fileName;
for(i=0; i< plugins.length; i++) {
plugin = plugins[i];
exclude = [];
@@ -137,4 +143,4 @@ for (i = 0; i < plugins.length; i++) {
var minFileDest = fileDest.replace(".js", ".min.js")
new steal.File(minFileDest).save(outBaos.toString());
print("***" + fileName + " pluginified and compressed")
-}
+}*/
diff --git a/buildAll.js b/buildAll.js
new file mode 100644
index 00000000..95b0a721
--- /dev/null
+++ b/buildAll.js
@@ -0,0 +1,130 @@
+// load('jquery/buildAll.js')
+
+load('steal/rhino/rhino.js')
+
+
+// load every plugin in a single app
+// get dependency graph
+// generate single script
+
+steal('steal/build/pluginify','steal/build/apps','steal/build/scripts').then( function(s){
+ var ignore = /\.\w+|test|generate|dist|qunit|fixtures|pages/
+
+ var plugins = [],
+ /**
+ * {"path/to/file.js" : ["file2/thing.js", ...]}
+ */
+ files = {};
+
+ s.File('jquery').contents(function( name, type, current ) {
+ if (type !== 'file' && !ignore.test(name)) {
+ var folder = current+"/"+name;
+ if(readFile(folder+"/"+name+".js")){
+ print(folder);
+ plugins.push(folder);
+ steal.File(folder).contents(arguments.callee, folder)
+ }
+
+ //steal.File(path + "/" + (current ? current + "/" : "") + name).contents(arguments.callee, (current ? current + "/" : "") + name);
+ }
+ },"jquery");
+
+ // tell it to load all plugins into this page
+
+
+ //steal.win().build_in_progress = true;
+ print(" LOADING APP ")
+ steal.build.open('steal/rhino/blank.html', {
+ startFiles: plugins
+ }, function(opener){
+
+ opener.each('js', function(options, text, stl){
+ print(options.rootSrc)
+ var dependencies = files[options.rootSrc] = [];
+ if(stl.dependencies){
+ for (var d = 0; d < stl.dependencies.length; d++) {
+ var depend = stl.dependencies[d];
+ if (depend.options.rootSrc !== "jquery/jquery.js") {
+ dependencies.push(depend.options.rootSrc);
+ }
+ }
+ }
+ })
+
+ s.File("jquery/dist/standalone").mkdirs();
+ s.File("jquery/dist/standalone/dependencies.json").save($.toJSON(files));
+ //get each file ...
+ print("Creating jquery/dist/standalone/")
+ var compressor = s.build.builders.scripts.compressors[ "localClosure"]()
+ for(var path in files){
+ if(path == "jquery/jquery.js"){
+ continue;
+ }
+ var content = readFile(path);
+ var funcContent = s.build.pluginify.getFunction(content);
+ if(typeof funcContent == "undefined"){
+ content = "";
+ } else {
+ content = "("+s.build.pluginify.getFunction(content)+")(jQuery);";
+ }
+ var out = path.replace(/\/\w+\.js/,"").replace(/\//g,".");
+ content = s.build.builders.scripts.clean(content);
+ print(" "+out+"");
+ content = s.build.builders.scripts.clean(content);
+ s.File("jquery/dist/standalone/"+out+".js").save(content);
+ s.File("jquery/dist/standalone/"+out+".min.js").save(compressor(content));
+ }
+
+ })
+
+ /*
+ var pageSteal = steal.build.open("steal/rhino/empty.html").steal,
+ steals = pageSteal.total,
+
+ files = {},
+ depends = function(stl, steals){
+ if(stl.dependencies){
+ for (var d = 0; d < stl.dependencies.length; d++) {
+ var depend = stl.dependencies[d];
+ if(!steals[depend.path]){
+ steals[depend.path] = true;
+ print("123 " + depend.path);
+ //depends(depend, steals);
+ }
+
+
+ }
+ }
+ },
+ all = function(c){
+ for(var i =0; i < steals.length; i++){
+ var pSteal =steals[i];
+
+ if(!pSteal.func){
+ c(pSteal)
+ }
+
+ }
+
+ };
+ print(" LOADED, GETTING DEPENDS");
+ all(function(stl){
+ files[stl.path] = stl;
+ })
+ all(function(stl){
+ print(stl.path)
+ var dependencies = files[stl.path] = [];
+ if(stl.dependencies){
+ for (var d = 0; d < stl.dependencies.length; d++) {
+ var depend = stl.dependencies[d];
+ if (depend.path !== "jquery/jquery.js") {
+ dependencies.push(depend.path);
+ }
+ }
+ }
+ })*/
+
+
+
+
+})
\ No newline at end of file
diff --git a/class/class.html b/class/class.html
index a4386612..ef16143d 100644
--- a/class/class.html
+++ b/class/class.html
@@ -61,11 +61,9 @@ History Tabs
-