Skip to content

Commit

Permalink
add drag/drop of ftp urls
Browse files Browse the repository at this point in the history
  • Loading branch information
ericmandel committed May 3, 2017
1 parent 878c354 commit 6fc3d01
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion js9-allinone.css
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions js9-allinone.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions js9.js
Original file line number Diff line number Diff line change
Expand Up @@ -13072,7 +13072,7 @@ JS9.dragexitCB = function(id, evt){

JS9.dragdropCB = function(id, evt, handler){
var i, s, opts, files, display;
var urlexp = /^https?:\/\//;
var urlexp = /^(https?|ftp):\/\//;
// convert jquery event to original event, if possible
if( evt.originalEvent ){
evt = evt.originalEvent;
Expand Down Expand Up @@ -14872,7 +14872,7 @@ JS9.mkPublic("Preload", function(arg1){
var oalerts = JS9.globalOpts.alerts;
var alen=arguments.length;
var obj = JS9.parsePublicArgs(arguments);
var baseexp = /^https?:\/\//;
var baseexp = /^(https?|ftp):\/\//;
arg1 = obj.argv[0];
// for socketio and loadProxy, support LoadProxy calls
if( JS9.globalOpts.loadProxy && JS9.helper.baseurl ){
Expand Down
Loading

0 comments on commit 6fc3d01

Please sign in to comment.