Closes #138, Ability to view files

Some minor fixes to editing creators.
This commit is contained in:
David Norton 2006-08-11 15:48:26 +00:00
parent 1447b3be92
commit e56abbc5f4
3 changed files with 34 additions and 8 deletions

View file

@ -260,7 +260,7 @@ ScholarItemPane = new function()
{ {
_itemBeingEdited.setType(id); _itemBeingEdited.setType(id);
_itemBeingEdited.save(); _itemBeingEdited.save();
reloadFields(); loadPane(0);
} }
} }
@ -345,7 +345,7 @@ ScholarItemPane = new function()
{ {
_itemBeingEdited.removeCreator(index); _itemBeingEdited.removeCreator(index);
_itemBeingEdited.save(); _itemBeingEdited.save();
reloadFields(); loadPane(0);
} }
function showEditor(elem) function showEditor(elem)

View file

@ -52,6 +52,7 @@ var ScholarPane = new function()
this.newNote = newNote; this.newNote = newNote;
this.addFileFromDialog = addFileFromDialog; this.addFileFromDialog = addFileFromDialog;
this.addFileFromPage = addFileFromPage; this.addFileFromPage = addFileFromPage;
this.viewSelectedFile = viewSelectedFile;
/* /*
* Called when the window is open * Called when the window is open
@ -225,6 +226,7 @@ var ScholarPane = new function()
else if(item.isFile()) else if(item.isFile())
{ {
document.getElementById('scholar-file-label').setAttribute('value',item.getField('title')); document.getElementById('scholar-file-label').setAttribute('value',item.getField('title'));
document.getElementById('scholar-file-view').setAttribute('disabled', item.ref.getFileLinkMode() == Scholar.Files.LINK_MODE_LINKED_URL);
document.getElementById('scholar-file-links').item = item.ref; document.getElementById('scholar-file-links').item = item.ref;
document.getElementById('item-pane').selectedIndex = 3; document.getElementById('item-pane').selectedIndex = 3;
} }
@ -441,6 +443,10 @@ var ScholarPane = new function()
{ {
document.getElementById('scholar-view-note-button').doCommand(); document.getElementById('scholar-view-note-button').doCommand();
} }
else if(item && item.isFile())
{
viewSelectedFile();
}
} }
} }
} }
@ -490,7 +496,12 @@ var ScholarPane = new function()
{ {
item = newItem(Scholar.ItemTypes.getID('website')); item = newItem(Scholar.ItemTypes.getID('website'));
if(item) if(item)
{
id = item.getID(); id = item.getID();
var c = getSelectedCollection();
if(c)
c.addItem(id);
}
} }
var fileID; var fileID;
@ -499,19 +510,33 @@ var ScholarPane = new function()
else else
fileID = Scholar.Files.importFromDocument(window.content.document, id); fileID = Scholar.Files.importFromDocument(window.content.document, id);
if(fileID) if(fileID && item)
{ {
var file = Scholar.Items.get(fileID); var file = Scholar.Items.get(fileID);
if(!item) if(file)
item = Scholar.Items.get(id);
if(file && item)
{ {
item.setField('title',file.getField('title')); item.setField('title',file.getField('title'));
item.save(); item.save();
} }
} }
} }
function viewSelectedFile()
{
if(itemsView && itemsView.selection.count == 1)
{
var file = getSelectedItems()[0];
if(file.getFileLinkMode() != Scholar.Files.LINK_MODE_LINKED_URL)
{
window.loadURI(file.getLocalFileURL());
}
else
{
window.loadURI(file.getFileURL());
}
}
}
} }
window.addEventListener("load", function(e) { ScholarPane.onLoad(e); }, false); window.addEventListener("load", function(e) { ScholarPane.onLoad(e); }, false);

View file

@ -196,6 +196,7 @@
</vbox> </vbox>
<vbox id="scholar-view-file" flex="1"> <vbox id="scholar-view-file" flex="1">
<label id="scholar-file-label"/> <label id="scholar-file-label"/>
<button id="scholar-file-view" label="View File" oncommand="ScholarPane.viewSelectedFile();"/>
<linksbox id="scholar-file-links" flex="1"/> <linksbox id="scholar-file-links" flex="1"/>
</vbox> </vbox>
</deck> </deck>