summaryrefslogtreecommitdiffstats
path: root/files/js/files.js
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2011-04-19 12:21:55 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2011-04-19 12:21:55 +0200
commit85764257eac2d35db32bfe225fdbf3f6301ef7c2 (patch)
treefb5989920fc41ec5a4294fdb2cdaa9e7849f4d45 /files/js/files.js
parent59e9c1ee0e2f75e69c46b83bcb8fd4dcbf1c26cc (diff)
downloadnextcloud-server-85764257eac2d35db32bfe225fdbf3f6301ef7c2.tar.gz
nextcloud-server-85764257eac2d35db32bfe225fdbf3f6301ef7c2.zip
refurbished new folder button
Diffstat (limited to 'files/js/files.js')
-rw-r--r--files/js/files.js79
1 files changed, 67 insertions, 12 deletions
diff --git a/files/js/files.js b/files/js/files.js
index bfb68317b02..901078680de 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -2,6 +2,8 @@ $(document).ready(function() {
$('#file_action_panel').attr('activeAction', false);
$('#file_upload_start').attr('mode', 'menu');
$('#file_upload_form').attr('uploading', false);
+ $('#file_newfolder_name').css('width', '14em');
+ $('#file_newfolder_submit').css('width', '3em');
// Sets browser table behaviour :
$('.browser tr').hover(
@@ -115,6 +117,40 @@ $(document).ready(function() {
});
});
+ $('#file_newfolder_name').click(function(){
+ if($('#file_newfolder_name').val() == 'New Folder'){
+ $('#file_newfolder_name').val('');
+ }
+ });
+
+ $('#file_newfolder_name').bind('keyup', adjustNewFolderSize);
+
+ $('#file_newfolder_submit').bind('vanish', function() {
+ $('#file_newfolder_name').bind('keyup', adjustNewFolderSize);
+ unsplitSize($('#file_newfolder_name'),$('#file_newfolder_submit'));
+ });
+
+ $('#file_newfolder_name').focusout(function(){
+ if($('#file_newfolder_name').val() == '') {
+ $('#file_newfolder_form')[0].reset();
+ $('#file_newfolder_submit').fadeOut(250).trigger('vanish');
+ }
+ });
+
+ $('#file_newfolder_submit').click(function() {
+ if($('#file_newfolder_name').val() != '') {
+ $.ajax({
+ url: 'ajax/newfolder.php',
+ data: "dir="+$('#dir').val()+"&foldername="+$('#file_newfolder_name').val(),
+ complete: function(data){
+ boolOperationFinished(data, false);
+ $('#file_newfolder_form')[0].reset();
+ }
+ });
+ }
+ $('#file_newfolder_submit').fadeOut(250).trigger('vanish');
+ });
+
// $('.upload').click(function(){
// if($('#file_action_panel').attr('activeAction') != 'upload') {
// $('#file_action_panel').attr('activeAction', 'upload');
@@ -138,18 +174,18 @@ $(document).ready(function() {
- $('.new-dir').click(function(){
- if($('#file_action_panel').attr('activeAction') != 'new-dir') {
- $('#file_action_panel').attr('activeAction', 'new-dir');
- $('#file_new_dir_name').val('');
- $('#file_action_panel form').slideUp(250);
- $('#file_newfolder_form').slideDown(250);
- } else {
- $('#file_newfolder_form').slideUp(250);
- $('#file_action_panel').attr('activeAction', false);
- }
- return false;
- });
+// $('.new-dir').click(function(){
+// if($('#file_action_panel').attr('activeAction') != 'new-dir') {
+// $('#file_action_panel').attr('activeAction', 'new-dir');
+// $('#file_new_dir_name').val('');
+// $('#file_action_panel form').slideUp(250);
+// $('#file_newfolder_form').slideDown(250);
+// } else {
+// $('#file_newfolder_form').slideUp(250);
+// $('#file_action_panel').attr('activeAction', false);
+// }
+// return false;
+// });
$('.download').click(function(event) {
var files='';
@@ -184,6 +220,25 @@ $(document).ready(function() {
});
});
+var adjustNewFolderSize = function() {
+ if($('#file_newfolder_name').val() != '') {
+ splitSize($('#file_newfolder_name'),$('#file_newfolder_submit'));
+ $('#file_newfolder_name').unbind('keyup', adjustNewFolderSize);
+ };
+}
+
+function splitSize(existingEl, appearingEl) {
+ nw = parseInt($(existingEl).css('width')) - parseInt($(appearingEl).css('width'));
+ $(existingEl).css('width', nw + 'px');
+ $(appearingEl).fadeIn(250);
+}
+
+function unsplitSize(stayingEl, vanishingEl) {
+ nw = parseInt($(stayingEl).css('width')) + parseInt($(vanishingEl).css('width'));
+ $(stayingEl).css('width', nw + 'px');
+ $(vanishingEl).fadeOut(250);
+}
+
function uploadFinished() {
result = $('#file_upload_target').contents().text();
result = eval("(" + result + ");");