Skip to content

Hi! I cleaned up your code for you! #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
GunioRobot wants to merge 1 commit into from
Closed

Hi! I cleaned up your code for you! #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ TOC:
A. How to get (and contribute) JMVC

1. Start a new project in git.

2. Fork ....
http://github.com/jupiterjs/steal and
http://github.com/jupiterjs/steal and
http://github.com/jupiterjs/jquerymx

3. Add steal and javascriptmvc as submodules of your project...
git submodule add git@github.com:_YOU_/steal.git steal
git submodule add git@github.com:_YOU_/jquerymx.git jquery

* Notice javascriptmvc 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.

6. Make a pull request to your fork.
24 changes: 12 additions & 12 deletions build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

load('steal/rhino/rhino.js')

var i, fileName, cmd,
var i, fileName, cmd,
plugins = [
"class" ,
"class" ,
"controller",
{
plugin: "controller/subscribe",
plugin: "controller/subscribe",
exclude: ["jquery/controller/controller.js",
"jquery/class/class.js",
"jquery/lang/lang.js",
Expand All @@ -19,16 +19,16 @@ var i, fileName, cmd,
"event/pause",
"event/resize",
{
plugin: "event/drag/limit",
plugin: "event/drag/limit",
exclude: ["jquery/lang/vector/vector.js", "jquery/event/livehack/livehack.js", "jquery/event/drag/drag.js"]},
{
plugin: "event/drag/scroll",
plugin: "event/drag/scroll",
exclude: ["jquery/dom/within/within.js", "jquery/dom/compare/compare.js", "jquery/event/drop/drop.js","jquery/lang/vector/vector.js", "jquery/event/livehack/livehack.js", "jquery/event/drag/drag.js"]},
{
plugin: "event/drop",
exclude: ["jquery/lang/vector/vector.js", "jquery/event/livehack/livehack.js", "jquery/event/drag/drag.js"]},
"event/hover",
"view/ejs",
"view/ejs",
"dom/closest",
"dom/compare",
{
Expand All @@ -37,7 +37,7 @@ var i, fileName, cmd,
},
"dom/fixture",
"dom/form_params",
"dom/within",
"dom/within",
"dom/cur_styles",
"model",
{
Expand Down Expand Up @@ -109,14 +109,14 @@ var plugin, exclude, fileDest, fileName;
out: fileDest,
exclude: exclude.length? exclude: false
})


var outBaos = new java.io.ByteArrayOutputStream();
var output = new java.io.PrintStream(outBaos);
runCommand("java", "-jar", "steal/build/scripts/compiler.jar", "--compilation_level", "SIMPLE_OPTIMIZATIONS", "--warning_level", "QUIET", "--js", fileDest, {
output: output
});

var minFileDest = fileDest.replace(".js", ".min.js")
new steal.File(minFileDest).save(outBaos.toString());
}
Expand All @@ -133,13 +133,13 @@ for (i = 0; i < plugins.length; i++) {
}
fileName = fileName || "jquery." + plugin.replace(/\//g, ".").replace(/dom\./, "").replace(/\_/, "") + ".js";
fileDest = "jquery/dist/" + fileName
// compress
// compress
var outBaos = new java.io.ByteArrayOutputStream();
var output = new java.io.PrintStream(outBaos);
runCommand("java", "-jar", "steal/build/scripts/compiler.jar", "--compilation_level", "SIMPLE_OPTIMIZATIONS", "--warning_level", "QUIET", "--js", fileDest, {
output: output
});

var minFileDest = fileDest.replace(".js", ".min.js")
new steal.File(minFileDest).save(outBaos.toString());
print("***" + fileName + " pluginified and compressed")
Expand Down
34 changes: 17 additions & 17 deletions buildAll.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ load('steal/rhino/rhino.js')

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;
Expand All @@ -24,20 +24,20 @@ steal('steal/build/pluginify','steal/build/apps','steal/build/scripts').then( fu
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] = [];
Expand All @@ -50,7 +50,7 @@ steal('steal/build/pluginify','steal/build/apps','steal/build/scripts').then( fu
}
}
})

s.File("jquery/dist/standalone").mkdirs();
s.File("jquery/dist/standalone/dependencies.json").save($.toJSON(files));
//get each file ...
Expand All @@ -74,9 +74,9 @@ steal('steal/build/pluginify','steal/build/apps','steal/build/scripts').then( fu
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,
Expand All @@ -91,21 +91,21 @@ steal('steal/build/pluginify','steal/build/apps','steal/build/scripts').then( fu
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){
Expand All @@ -123,8 +123,8 @@ steal('steal/build/pluginify','steal/build/apps','steal/build/scripts').then( fu
}
}
})*/




})
6 changes: 3 additions & 3 deletions class/class.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<style type='text/css'>
body {font-family: verdana}
.tabs, .history_tabs {

padding: 0px; margin: 20px 0 0 0;
}
li {
Expand Down Expand Up @@ -89,12 +89,12 @@ <h2>History Tabs</h2>

// ignore clicks
"li click" : function(){},

// listen for history changes
"{window} hashchange" : function(ev){
var hash = window.location.hash;
this.activate(hash === '' || hash === '#' ?
this.element.find("li:first") :
this.element.find("li:first") :
this.element.find("a[href="+hash+"]").parent()
)
}
Expand Down
Loading