From 6fc3d016da179ac474ac7e57ec2ab89d0e373511 Mon Sep 17 00:00:00 2001 From: Eric Mandel Date: Wed, 3 May 2017 03:10:21 -0400 Subject: [PATCH] add drag/drop of ftp urls --- js9-allinone.css | 2 +- js9-allinone.js | 8 ++++---- js9.js | 4 ++-- js9.min.js | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/js9-allinone.css b/js9-allinone.css index 355b6644..33d8cd76 100644 --- a/js9-allinone.css +++ b/js9-allinone.css @@ -1,4 +1,4 @@ -/* JS9 allinone: v1.11, Tue May 2 14:16:26 EDT 2017 */ +/* JS9 allinone: v1.11, Wed May 3 03:07:30 EDT 2017 */ @charset "UTF-8"; /*! * jQuery contextMenu - Plugin for simple contextMenu handling diff --git a/js9-allinone.js b/js9-allinone.js index a71bfa69..761efc7c 100644 --- a/js9-allinone.js +++ b/js9-allinone.js @@ -1,4 +1,4 @@ -/* JS9 allinone: v1.11, Tue May 2 14:16:26 EDT 2017 */ +/* JS9 allinone: v1.11, Wed May 3 03:07:30 EDT 2017 */ // fix to allow jquery to be loaded into an electron.js app // http://electron.atom.io/docs/faq/ // @@ -3082,8 +3082,8 @@ b.posOffset),b.ipos=b.displayToImagePos(b.pos),e.inResize(b.pos)||c.preventDefau var d=b.image;d&&(d.pos=a.eventToDisplayPos(c,d.posOffset),d.ipos=d.displayToImagePos(d.pos),d.pos0||(d.pos0=d.pos),d.ipos0||(d.ipos0=d.ipos),b.resizing||(c.preventDefault(),d.valpos=null,d.clickInRegion&&(b=d.display.layers.regions.params.sel)&&(d.params.listonchange||b.params.listonchange)&&(d.updateShape(d.clickInLayer,b,null,"list",!0),"regions"===d.clickInLayer&&d.listRegions("selected",{mode:2})),a.hasOwnProperty("MouseTouch")&&a.MouseTouch.action(d,c),a.specialKey(c)||(d.valpos||(d.valpos= d.updateValpos(d.ipos,!1)),a.specialKey(c)||d.xeqPlugins("mouse","onmousemove",c))))};a.mouseOverCB=function(c){var b=c.data.image,d=$(document).scrollLeft(),e=$(document).scrollTop();c.preventDefault();b&&(b.display.displayConjq.focus(),window.scrollTo(d,e),a.specialKey(c)||(b.pos=a.eventToDisplayPos(c),b.ipos=b.displayToImagePos(b.pos),a.specialKey(c)||b.xeqPlugins("mouse","onmouseover",c)))};a.mouseOutCB=function(c){var b=c.data.image;c.preventDefault();b&&(b.display.displayConjq.blur(),a.specialKey(c)|| (b.pos=a.eventToDisplayPos(c),b.ipos=b.displayToImagePos(b.pos),a.specialKey(c)||b.xeqPlugins("mouse","onmouseout",c)))};a.wheelCB=function(c){var b=c.data,d=b.image;b.mousetouchZoom&&d&&a.hasOwnProperty("MouseTouch")&&a.MouseTouch.Actions["wheel zoom"]&&(a.MouseTouch.Actions["wheel zoom"](d,c),c.preventDefault())};a.keyPressCB=function(a){var b=a.data.image;a.preventDefault();b&&b.xeqPlugins("keypress","onkeypress",a)};a.keyDownCB=function(c){var b,d=c.data.image;a.hasOwnProperty("Keyboard")&&(b= -d?d.ipos:{x:null,y:null},a.Keyboard.action(d,b,c));d&&d.xeqPlugins("keypress","onkeydown",c)};a.dragenterCB=function(a,b){b.stopPropagation();b.preventDefault()};a.dragoverCB=function(a,b){b.stopPropagation();b.preventDefault()};a.dragexitCB=function(a,b){b.stopPropagation();b.preventDefault()};a.dragdropCB=function(c,b,d){var e,f,g,h,k=/^https?:\/\//;b.originalEvent&&(b=b.originalEvent);b.stopPropagation();b.preventDefault();f=$.extend(!0,{},a.fits.options);f.display=f.display||c;f.extlist=f.extlist|| -a.globalOpts.extlist;g=b.target.files||b.dataTransfer.files;h=a.lookupDisplay(f.display);g.length?window.setTimeout(function(){var b,c;for(e=0;e", @@ -3195,7 +3195,7 @@ g,g,g),f=f||a.lightOpts[a.LIGHTWIN].imageWin,h=sprintf("JS9 Display"+a.IDFMT,g), d.match(/src=["'].*js9\.js/)||d.match(/src=["'].*js9\.min\.js/)||(d+=sprintf('<%s type="text/javascript" src="js9.min.js">',"script","script"));h=e||sprintf("
",g,g,g);e=sprintf("%s%s\n",h);if(c=window.open("data:text/html,