diff --git a/route/static/app/files.js b/route/static/app/files.js index 8831a18c4..888cbc756 100755 --- a/route/static/app/files.js +++ b/route/static/app/files.js @@ -1,4 +1,4 @@ -console.log(lan); +// console.log(lan); //判断磁盘数量超出宽度 function isDiskWidth(){ @@ -342,7 +342,8 @@ function getFiles(Path) { $("#set_icon").removeClass("active"); body += "\ \ - " + cnametext + "\ + \ + " + cnametext + "\ "+toSize(fmp[1])+"\ "+getLocalTime(fmp[2])+"\ "+fmp[3]+"\ @@ -358,7 +359,8 @@ function getFiles(Path) { } else { $("#set_icon").addClass("active"); $("#set_list").removeClass("active"); - body += "
\ + body += "
\ \
\
" + fmp[0] + "
\ @@ -414,14 +416,16 @@ function getFiles(Path) { "; } else{ - body += "
\ + body += "
\ \
\
" + fmp[0] + "
\
"; } } - var dirInfo = '(共{1}个目录与{2}个文件,大小:'.replace('{1}',rdata.DIR.length+'').replace('{2}',rdata.DIR.length+'')+''+(toSize(totalSize))+'获取)'; + var dirInfo = '(共{1}个目录与{2}个文件,大小:'.replace('{1}',rdata.DIR.length+'').replace('{2}',rdata.DIR.length+'')+'' + + (toSize(totalSize))+'获取)'; $("#DirInfo").html(dirInfo); if(getCookie('rank')=='a'){ var tablehtml = '\ @@ -512,11 +516,15 @@ function getFiles(Path) { $("input[name=id]").dblclick(function(e){ e.stopPropagation(); }); + + // //禁用右键 // $("#fileCon").bind("contextmenu",function(e){ // return false; // }); // bindselect(); + + // //绑定右键 // $("#fileCon").mousedown(function(e){ // var count = totalFile(); @@ -529,15 +537,17 @@ function getFiles(Path) { // } // } // }); + $(".folderBox,.folderBoxTr").mousedown(function(e){ + // console.log(e); var count = totalFile(); if(e.which == 3) { if(count <= 1){ var a = $(this); - a.contextify(RClick(a.attr("filetype"),a.attr("data-path"),a.find("input").val())); - } - else{ - RClickAll(e); + var option = rightMenuClick(a.attr("filetype"),a.attr("data-path"),a.find("input").val()); + a.contextify(option); + } else{ + rightMenuClickAll(e); } } }); @@ -775,9 +785,11 @@ function getDisk() { var LBody = ''; $.get('/system/disk_info', function(rdata) { for (var i = 0; i < rdata.length; i++) { - LBody += " " + (rdata[i].path=='/'?lan.files.path_root:rdata[i].path) + "(" + rdata[i].size[2] + ")"; + LBody += "\ +  " + (rdata[i].path=='/'?lan.files.path_root:rdata[i].path) + "(" + rdata[i].size[2] + ")"; } - var trash = ' 回收站'; + var trash = '\ +  回收站'; $("#comlist").html(LBody+trash); isDiskWidth(); },'json'); @@ -975,13 +987,16 @@ function downloadFile(action){ title: lan.files.down_title, content: '\
\ - URL地址:\ + URL地址:\ + \
\
\ - 下载到:\ + 下载到:\ + \
\
\ - 文件名:\ + 文件名:\ + \
\ ', success:function(){ @@ -1176,7 +1191,9 @@ function zip(dirName,submits) { content: '
' +'
' +'' - +''+lan.files.zip_to+'' + +''+lan.files.zip_to+'\ + \ + ' +'
' +'
' +'' @@ -1230,8 +1247,8 @@ function unZip(fileName,type) { content: '
' +'
' +''+lan.files.unzip_name+'
' - +'
'+lan.files.unzip_to+'
' + umpass - +'
'+lan.files.unzip_coding+'
' + + umpass +'
'+lan.files.unzip_coding+'' @@ -1255,7 +1272,8 @@ function isZip(fileName){ //是否文本文件 function isText(fileName){ - var exts = ['rar','zip','tar.gz','gz','iso','xsl','doc','xdoc','jpeg','jpg','png','gif','bmp','tiff','exe','so','7z','bz']; + var exts = ['rar','zip','tar.gz','gz','iso','xsl','doc','xdoc','jpeg', + 'jpg','png','gif','bmp','tiff','exe','so','7z','bz']; return isExts(fileName,exts)?false:true; } @@ -1446,36 +1464,63 @@ function onAccess(){ } } } + + //右键菜单 -function RClick(type,path,name){ +function rightMenuClick(type,path,name){ + console.log(type,path,name); var displayZip = isZip(type); var options = {items:[ - {text: lan.files.file_menu_copy, onclick: function() {copyFile(path)}}, - {text: lan.files.file_menu_mv, onclick: function() {cutFile(path)}}, - {text: lan.files.file_menu_rename, onclick: function() {reName(0,name)}}, - {text: lan.files.file_menu_auth, onclick: function() {setChmod(0,path)}}, - {text: lan.files.file_menu_zip, onclick: function() {zip(path)}} - + {text: "复制", onclick: function() {copyFile(path)}}, + {text: "剪切", onclick: function() {cutFile(path)}}, + {text: "重命名", onclick: function() {reName(0,name)}}, + {text: lan.files.file_menu_auth, onclick: function() {setChmod(0,path)}}, + {text: lan.files.file_menu_zip, onclick: function() {zip(path)}}, ]}; if(type == "dir"){ - options.items.push({text: lan.files.file_menu_del, onclick: function() {DeleteDir(path)}}); + options.items.push({text: lan.files.file_menu_del, onclick: function() { + deleteDir(path)} + }); } else if(isText(type)){ - options.items.push({text: lan.files.file_menu_edit, onclick: function() {onlineEditFile(0,path)}},{text: lan.files.file_menu_down, onclick: function() {GetFileBytes(path)}},{text: lan.files.file_menu_del, onclick: function() {deleteFile(path)}}); + options.items.push({text: lan.files.file_menu_edit, onclick: function() { + onlineEditFile(0,path); + }},{text: lan.files.file_menu_down, onclick: function() { + getFileBytes(path); + }},{ text: lan.files.file_menu_del, onclick: function() { + deleteFile(path); + }}); } else if(displayZip != -1){ - options.items.push({text: lan.files.file_menu_unzip, onclick: function() {unZip(path,displayZip)}},{text: lan.files.file_menu_down, onclick: function() {GetFileBytes(path)}},{text: lan.files.file_menu_del, onclick: function() {deleteFile(path)}}); + options.items.push({text: lan.files.file_menu_unzip, onclick: function() { + unZip(path,displayZip); + }},{text: lan.files.file_menu_down, onclick: function() { + getFileBytes(path); + }},{text: lan.files.file_menu_del, onclick: function() { + deleteFile(path); + }}); } else if(isImage(type)){ - options.items.push({text: lan.files.file_menu_img, onclick: function() {GetImage(path)}},{text: lan.files.file_menu_down, onclick: function() {GetFileBytes(path)}},{text: lan.files.file_menu_del, onclick: function() {deleteFile(path)}}); + options.items.push({text: lan.files.file_menu_img, onclick: function() { + getImage(path); + }},{text: lan.files.file_menu_down, onclick: function() { + getFileBytes(path); + }},{text: lan.files.file_menu_del, onclick: function() { + deleteFile(path); + }}); } else{ - options.items.push({text: lan.files.file_menu_down, onclick: function() {GetFileBytes(path)}},{text: lan.files.file_menu_del, onclick: function() {deleteFile(path)}}); + options.items.push({text: lan.files.file_menu_down, onclick: function() { + getFileBytes(path); + }},{text: lan.files.file_menu_del, onclick: function() { + deleteFile(path); + }}); } return options; } + //右键批量操作 -function RClickAll(e){ +function rightMenuClickAll(e){ var menu = $("#rmenu"); var windowWidth = $(window).width(), windowHeight = $(window).height(), diff --git a/route/static/js/jquery.contextify.min.js b/route/static/js/jquery.contextify.min.js index 7dfd43adc..7cc68d13e 100755 --- a/route/static/js/jquery.contextify.min.js +++ b/route/static/js/jquery.contextify.min.js @@ -1,9 +1,6 @@ /*! -* jQuery Contextify v1.0.8 (http://contextify.js.org) +* jQuery Contextify v1.0.7 (http://contextify.js.org) * Copyright (c) 2016 Adam Bouqdib * Licensed under GPL-2.0 (http://abemedia.co.uk/license) */ - - -!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a(jQuery,window)}(function(a,b){function c(b,c){this.element=b,this.options=a.extend({},e,c),this._defaults=e,this._name=d,this.init()}var d="contextify",e={items:[],action:"contextmenu",menuId:"contextify-menu",menuClass:"dropdown-menu",headerClass:"dropdown-header",dividerClass:"divider",before:!1},f=0,g=a(b);c.prototype.init=function(){var b=a.extend({},this.options,a(this.element).data());b.id=f,a(this.element).attr("data-contextify-id",b.id).on("contextmenu",function(c){c.preventDefault(),"function"==typeof b.before&&b.before(this,b);var d=a('