summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2013-05-17 06:48:24 +0200
committerThomas Tanghus <thomas@tanghus.net>2013-05-17 06:48:24 +0200
commita0b79f564944479beb497a75bb45cf02fcaf38ca (patch)
tree88329e15a97146f6f25544a033d1cf71cb7e5683
parente60d86bdd1b45e29bf09bacf48bab8d847c54a72 (diff)
downloadnextcloud-server-a0b79f564944479beb497a75bb45cf02fcaf38ca.tar.gz
nextcloud-server-a0b79f564944479beb497a75bb45cf02fcaf38ca.zip
Dialogs: Loose up-button.
-rw-r--r--core/css/styles.css1
-rw-r--r--core/js/oc-dialogs.js14
-rw-r--r--core/templates/filepicker.html1
3 files changed, 0 insertions, 16 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index eab4e226a11..71b1c1fab85 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -382,7 +382,6 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
.ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#fff; }
/* ---- DIALOGS ---- */
-#oc-dialog-filepicker-content .dirup {width:4%; font-weight: bold;}
#oc-dialog-filepicker-content .dirtree {width:92%; overflow:hidden; }
#oc-dialog-filepicker-content .dirtree span:not(:last-child) { cursor: pointer; }
#oc-dialog-filepicker-content .dirtree span:last-child { font-weight: bold; }
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 8f127bfb62b..43b698df68f 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -196,10 +196,8 @@ var OCdialogs = {
self.$filePicker.ready(function() {
self.$filelist = self.$filePicker.find('.filelist');
- self.$dirUp = self.$filePicker.find('.dirup');
self.$dirTree = self.$filePicker.find('.dirtree');
self.$dirTree.on('click', 'span:not(:last-child)', self, self.handleTreeListSelect);
- self.$dirUp.click(self, self.filepickerDirUp);
self.$filelist.on('click', 'li', function(event) {
self.handlePickerClick(event, $(this));
});
@@ -418,18 +416,6 @@ var OCdialogs = {
self.fillFilePicker(dir);
},
/**
- * go one directory up
- */
- filepickerDirUp:function(event) {
- var self = event.data;
- var old_path = self.$filePicker.data('path');
- if (old_path !== '') {
- var splitted_path = old_path.split('/');
- splitted_path.pop();
- self.fillFilePicker(splitted_path.join('/'));
- }
- },
- /**
* handle clicks made in the filepicker
*/
handlePickerClick:function(event, $element) {
diff --git a/core/templates/filepicker.html b/core/templates/filepicker.html
index e7aa77a732a..2b7942bd46a 100644
--- a/core/templates/filepicker.html
+++ b/core/templates/filepicker.html
@@ -1,5 +1,4 @@
<div id="{dialog_name}" title="{title}">
- <button class="dirup">↑</button>
<span class="dirtree"></span>
<ul class="filelist">
<li data-entryname="{filename}" data-type="{type}">