From b03e86f78c50801a0d0be0ef81e4a5a7d2ee89da Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Fri, 17 Jan 2014 13:14:03 +0000 Subject: [PATCH] directly use documentsPanel, remove unused documentsView --- static/js/documentsView.js | 247 ------------------------------------- static/js/item.js | 5 +- 2 files changed, 1 insertion(+), 251 deletions(-) delete mode 100644 static/js/documentsView.js diff --git a/static/js/documentsView.js b/static/js/documentsView.js deleted file mode 100644 index 11c547a65..000000000 --- a/static/js/documentsView.js +++ /dev/null @@ -1,247 +0,0 @@ -// vim: et:ts=4:sw=4:sts=4:ft=javascript - -'use strict'; - -pandora.ui.documentsView = function(options, self) { - - var that = pandora.ui.documentsPanel({ - isItemView: true - }); - return that; - - var self = self || {}, - that = Ox.Element({}, self) - .defaults({ - id: '' - }) - .options(options || {}); - - self.selected = null; - - self.$toolbar = Ox.Bar({ - size: 24 - }); - - self.$preview = Ox.Element(); - - self.$menu = Ox.MenuButton({ - items: [ - { - id: 'add', - title: Ox._('Add Documents...') - }, - ], - title: 'set', - type: 'image' - }) - .css({ - float: 'left', - margin: '4px' - }) - .bindEvent({ - click: function(data) { - if (data.id == 'add') { - addDocuments(); - } else if (data.id == 'fixme') { - } - } - }) - .appendTo(self.$toolbar); - - self.$documentsList = Ox.TableList({ - columns: [ - { - align: 'left', - id: 'index', - operator: '+', - title: Ox._('Index'), - visible: false, - width: 60 - }, - { - align: 'left', - id: 'id', - operator: '+', - title: Ox._('ID'), - visible: false, - width: 60 - }, - { - align: 'left', - id: 'user', - operator: '+', - title: Ox._('User'), - visible: false, - width: 60 - }, - { - align: 'left', - id: 'name', - operator: '+', - title: Ox._('Name'), - visible: true, - width: 360 - }, - { - id: 'extension', - operator: '+', - title: Ox._('Extension'), - visible: false, - width: 60 - }, - { - editable: true, - id: 'description', - operator: '+', - title: Ox._('Description'), - visible: true, - width: 240 - } - ], - columnsMovable: true, - columnsRemovable: true, - columnsResizable: true, - columnsVisible: true, - items: options.documents, - keys: ['ratio'], - scrollbarVisible: true, - sort: [{key: 'index', operator: '+'}], - sortable: true, - unique: 'id' - }) - .bindEvent({ - add: function(data) { - addDocuments(); - }, - 'delete': function(data) { - if (data.ids.length > 0 && options.editable) { - pandora.api.removeDocument({ - ids: data.ids, - item: pandora.user.ui.item - }, function(result) { - Ox.Request.clearCache(); - //fixme just upload list here - //self.$documentsList.reloadList(); - pandora.$ui.contentPanel.replaceElement(1, - pandora.$ui.item = pandora.ui.item()); - }); - } - }, - move: function(data) { - Ox.Request.clearCache(); - pandora.api.sortDocuments({ - item: pandora.user.ui.item, - ids: data.ids - }) - }, - select: selectDocument, - submit: function(data) { - var value = self.$documentsList.value(data.id, data.key); - if (data.value != value && !(data.value === '' && value === null)) { - self.$documentsList.value(data.id, data.key, data.value || null); - data.key == 'description' && pandora.api.editDocument({ - description: data.value, - id: data.id, - item: pandora.user.ui.item - }, function(result) { - // if description is empty, fall back to global description - self.$documentsList.value(data.id, data.key, result.data.description); - renderPreview(); - }); - } - } - }); - - function addDocuments() { - pandora.$ui.documentsDialog = pandora.ui.documentsDialog().open(); - } - - function renderPreview() { - var size = getPreviewSize(), - src = '/documents/' + self.selected + '/256p.jpg'; - self.$preview.empty(); - self.selected && self.$preview - .append( - Ox.ImageElement({ - height: size.height, - src: src, - width: size.width - }) - .css({ - margin: size.margin, - borderRadius: '8px' - }) - .on({ - click: function() { - var info = self.$documentsList.value(self.selected), - url = '/documents/' + self.selected + '/' + info.name + '.' + info.extension; - window.open(url, '_blank'); - } - }) - ) - .append(Ox.Element() - .css({ - margin: size.margin, - paddingTop: '8px' - }) - .html(self.$documentsList.value(self.selected, 'description') - )); - } - - function getPreviewSize() { - var ratio = self.$documentsList.value(self.selected, 'ratio'), - previewWidth = self.$preview.width() - 8, - height = ratio < 1 ? previewWidth : previewWidth / ratio, - width = ratio >= 1 ? previewWidth : previewWidth * ratio, - left = Math.floor((previewWidth - Ox.UI.SCROLLBAR_SIZE - width) / 2); - return { - height: height, - // fixme: CSS gets applied twice, to image and enclosing element - margin: [8, 8, 8, 8 + left].map(function(px) { - return px / 2 + 'px'; - }).join(' '), - width: width - }; - } - - function selectDocument(data) { - if (data.ids[0] != self.selected) { - self.selected = data.ids[0]; - renderPreview(); - } - } - - that.setElement(Ox.SplitPanel({ - elements: [ - { - element: Ox.SplitPanel({ - elements: [ - { - element: self.$toolbar, - size: 24 - }, - { - element: self.$documentsList - }, - ], - orientation: 'vertical' - }) - }, - { - collapsible: true, - element: self.$preview, - size: 256 - } - ], - orientation: 'horizontal' - }) - ); - - - that.reload = function() { - self.$documentsList.reloadList(); - } - - return that; - -}; diff --git a/static/js/item.js b/static/js/item.js index c86e286b0..54ca7830a 100644 --- a/static/js/item.js +++ b/static/js/item.js @@ -16,9 +16,6 @@ pandora.ui.item = function() { 'cuts', 'director', 'duration', 'durations', 'editable', 'layers', 'modified', 'parts', 'posterFrame', 'rendered', 'rightslevel', 'size', 'title', 'videoRatio', 'year' - ] : pandora.user.ui.itemView == 'documents' ? [ - 'director', 'documents', 'duration', 'durations', 'editable', - 'rightslevel', 'size', 'title', 'videoRatio', 'year' ] : [] }, pandora.user.ui.itemView == 'info' && pandora.site.capabilities.canEditMetadata[pandora.user.level] ? 0 : -1, function(result) { @@ -70,7 +67,7 @@ pandora.ui.item = function() { } else if (pandora.user.ui.itemView == 'documents') { pandora.$ui.contentPanel.replaceElement(1, - pandora.$ui.documents = pandora.ui.documentsView(result.data) + pandora.$ui.documents = pandora.ui.documentsPanel({isItemView: true}) ); } else if (pandora.user.ui.itemView == 'player') {