From dfce5b4d88d64a2f09a9bbdc0f5a8130c77a2e43 Mon Sep 17 00:00:00 2001 From: rolux Date: Thu, 16 Jan 2014 02:44:39 +0000 Subject: [PATCH] documents panel: update menu --- static/js/documentsPanel.js | 39 +++++++------------------------------ 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/static/js/documentsPanel.js b/static/js/documentsPanel.js index aedc9b553..af2532f24 100644 --- a/static/js/documentsPanel.js +++ b/static/js/documentsPanel.js @@ -113,8 +113,7 @@ pandora.ui.documentsPanel = function(options) { image: 'upload', tooltip: Ox._('Upload Documents...'), type: 'image' - }) - ) + })) .css({float: 'left', margin: '4px 2px 4px 4px'}) .bindEvent({ click: function(data) { @@ -256,11 +255,12 @@ pandora.ui.documentsPanel = function(options) { items: isItemView ? [ {id: 'open', title: '', keyboard: 'return'}, {id: 'edit', title: ''}, + {}, {id: 'remove', title: '', keyboard: 'delete'} ] : [ {id: 'open', title: '', keyboard: 'return'}, - {id: 'addtoitem', title: ''}, - {id: 'addtolist', title: ''}, + {id: 'add', title: ''}, + {}, {id: 'replace', title: Ox._('Replace Document...')}, {id: 'delete', title: '', keyboard: 'delete'} ], @@ -271,16 +271,13 @@ pandora.ui.documentsPanel = function(options) { .css({float: 'left', margin: '4px'}) .bindEvent({ click: function(data) { - if (data.id == 'addtoitem') { - addToItem(); - } else if (data.id == 'addtolist') { - addToList(); + if (data.id == 'add') { + addDocuments(); } else if (data.id == 'open') { openDocuments(); } else if (data.id == 'edit') { editDocuments(); } else if (data.id == 'replace') { - console.log('replace', data); replaceDocument(data.files); } else if (data.id == 'remove') { removeDocuments(); @@ -400,10 +397,6 @@ pandora.ui.documentsPanel = function(options) { ); function addDocuments() { - pandora.$ui.documentsDialog = pandora.ui.documentsDialog().open(); - } - - function addToItem() { pandora.api.addDocument({ item: ui.item, ids: ui.documentsSelection[''] @@ -418,21 +411,6 @@ pandora.ui.documentsPanel = function(options) { }); } - function addToList() { - pandora.api.addDocument({ - list: ui._list, - ids: ui.documentsSelection[''] - }, function() { - Ox.Request.clearCache(); - if (ui.item && ui.itemView == 'documents') { - //fixme just upload list here - //self.$documentsList.reloadList(); - pandora.$ui.contentPanel.replaceElement(1, - pandora.$ui.item = pandora.ui.item()); - } - }); - } - function closeDocuments() { if (pandora.$ui.documentDialog) { pandora.$ui.documentDialog.close(); @@ -733,13 +711,10 @@ pandora.ui.documentsPanel = function(options) { $itemMenu.setItemTitle('edit', Ox._('Edit ' + string + '...')) .setItemTitle('remove', Ox._('Remove ' + string)); } else { - $itemMenu.setItemTitle('addtoitem', Ox._( + $itemMenu.setItemTitle('add', Ox._( 'Add ' + string + ' to Current ' + pandora.site.itemName.singular )) - .setItemTitle('addtolist', Ox._( - 'Add ' + string + ' to All Items in Current List' - )) .setItemTitle('delete', Ox._('Delete ' + string + '...')); } $itemMenu[selected.length ? 'show' : 'hide']();