Patch for jquery.contextmenu.js. Add jquery.contextmenu.js to Closure compiler step in Makefile

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2060 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2012-03-17 17:45:28 +00:00
parent 2b669ce556
commit 5786a1bc30
3 changed files with 7 additions and 3 deletions

View File

@ -6,7 +6,9 @@ CLOSURE=build/tools/closure-compiler.jar
ZIP=zip ZIP=zip
# All files that will be compiled by the Closure compiler. # All files that will be compiled by the Closure compiler.
JS_FILES=\ JS_FILES=\
contextmenu/jquery.contextmenu.js \
browser.js \ browser.js \
svgtransformlist.js \ svgtransformlist.js \
math.js \ math.js \
@ -55,6 +57,8 @@ $(COMPILED_JS):
$(CLOSURE_JS_ARGS) \ $(CLOSURE_JS_ARGS) \
--js_output_file $(COMPILED_JS) --js_output_file $(COMPILED_JS)
compile: $(COMPILED_JS)
release: build/$(PACKAGE) release: build/$(PACKAGE)
cd build ; $(ZIP) $(PACKAGE).zip -r $(PACKAGE) ; cd .. cd build ; $(ZIP) $(PACKAGE).zip -r $(PACKAGE) ; cd ..
tar -z -c -f build/$(PACKAGE)-src.tar.gz \ tar -z -c -f build/$(PACKAGE)-src.tar.gz \

View File

@ -38,12 +38,12 @@ if(jQuery)( function() {
menu.addClass('contextMenu'); menu.addClass('contextMenu');
// Simulate a true right click // Simulate a true right click
$(this).mousedown( function(e) { $(this).bind( "contextmenu mousedown", function(e) {
var evt = e; var evt = e;
$(this).mouseup( function(e) { $(this).mouseup( function(e) {
var srcElement = $(this); var srcElement = $(this);
srcElement.unbind('mouseup'); srcElement.unbind('mouseup');
if( evt.button === 2 || o.allowLeft) { if( evt.button === 2 || o.allowLeft || evt.type === "contextmenu" ) {
e.stopPropagation(); e.stopPropagation();
// Hide context menus that may be showing // Hide context menus that may be showing
$(".contextMenu").hide(); $(".contextMenu").hide();

View File

@ -21,11 +21,11 @@
<script type="text/javascript" src="svgicons/jquery.svgicons.js"></script> <script type="text/javascript" src="svgicons/jquery.svgicons.js"></script>
<script type="text/javascript" src="jgraduate/jquery.jgraduate.min.js"></script> <script type="text/javascript" src="jgraduate/jquery.jgraduate.min.js"></script>
<script type="text/javascript" src="spinbtn/JQuerySpinBtn.min.js"></script> <script type="text/javascript" src="spinbtn/JQuerySpinBtn.min.js"></script>
<script type="text/javascript" src="contextmenu/jquery.contextMenu.min.js"></script>
<!--{if svg_edit_release}> <!--{if svg_edit_release}>
<script type="text/javascript" src="svgedit.compiled.js"></script> <script type="text/javascript" src="svgedit.compiled.js"></script>
<!{else}--> <!{else}-->
<script type="text/javascript" src="contextmenu/jquery.contextMenu.js"></script>
<script type="text/javascript" src="browser.js"></script> <script type="text/javascript" src="browser.js"></script>
<script type="text/javascript" src="svgtransformlist.js"></script> <script type="text/javascript" src="svgtransformlist.js"></script>
<script type="text/javascript" src="math.js"></script> <script type="text/javascript" src="math.js"></script>