Tiny uplift of jgraduate and really check in the Makefile changes this time

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1835 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2010-10-29 05:23:25 +00:00
parent 6a74f57cf4
commit c5083035ae
2 changed files with 14 additions and 22 deletions

View File

@ -18,27 +18,19 @@ build/$(PACKAGE):
# minify spin button
java -jar $(YUICOMPRESS) build/$(PACKAGE)/spinbtn/JQuerySpinBtn.js > build/$(PACKAGE)/spinbtn/JQuerySpinBtn.min.js
# minify SVG-edit files
java -jar $(YUICOMPRESS) build/$(PACKAGE)/svgutils.js > build/$(PACKAGE)/svgutils.min.js
java -jar $(YUICOMPRESS) build/$(PACKAGE)/browsersupport.js > build/$(PACKAGE)/browsersupport.min.js
java -jar $(YUICOMPRESS) build/$(PACKAGE)/svgtransformlist.js > build/$(PACKAGE)/svgtransformlist.min.js
java -jar $(YUICOMPRESS) build/$(PACKAGE)/math.js > build/$(PACKAGE)/math.min.js
java -jar $(YUICOMPRESS) build/$(PACKAGE)/svg-editor.js > build/$(PACKAGE)/svg-editor.min.js
java -jar $(YUICOMPRESS) build/$(PACKAGE)/svgcanvas.js > build/$(PACKAGE)/svgcanvas.min.js
# codedread: This is how to compile everything into one big JS file. This
# would replace the 7 lines above. Seems to work for me but
# leaving compiled out for now for additional testing.
# NOTE: Some files are not ready for the Closure compiler:
# jquery, jgraduate.
# java -jar $(CLOSURE) \
# --js browsersupport.js \
# --js svgtransformlist.js \
# --js math.js \
# --js svgutils.js \
# --js svgcanvas.js \
# --js svg-editor.js \
# --js locale/locale.js \
# --js_output_file svgedit.compiled.js
# codedread: NOTE: Some files are not ready for the Closure compiler: (jquery)
java -jar $(CLOSURE) \
--js browsersupport.js \
--js svgtransformlist.js \
--js math.js \
--js svgutils.js \
--js svgcanvas.js \
--js svg-editor.js \
--js locale/locale.js \
--js_output_file svgedit.compiled.js
# CSS files do not work remotely
# java -jar $(YUICOMPRESS) build/$(PACKAGE)/spinbtn/JQuerySpinBtn.css > build/$(PACKAGE)/spinbtn/JQuerySpinBtn.min.css

View File

@ -116,11 +116,11 @@ $.jGraduate = {
jQuery.fn.jGraduateDefaults = {
paint: new $.jGraduate.Paint(),
window: {
pickerTitle: "Drag markers to pick a paint",
pickerTitle: "Drag markers to pick a paint"
},
images: {
clientPath: "images/",
},
clientPath: "images/"
}
};
jQuery.fn.jGraduate =
@ -160,7 +160,7 @@ jQuery.fn.jGraduate =
// make a copy of the incoming paint
paint: new $.jGraduate.Paint({copy: $settings.paint}),
okCallback: $.isFunction($arguments[1]) && $arguments[1] || null,
cancelCallback: $.isFunction($arguments[2]) && $arguments[2] || null,
cancelCallback: $.isFunction($arguments[2]) && $arguments[2] || null
});
var pos = $this.position(),