Editor fixed.
This commit is contained in:
parent
a02d5d1a3d
commit
ce4fe9e7cb
|
@ -28,6 +28,6 @@ OC_Util::checkLoggedIn();
|
||||||
OC_Util::checkAppEnabled('bookmarks');
|
OC_Util::checkAppEnabled('bookmarks');
|
||||||
|
|
||||||
require_once('bookmarksHelper.php');
|
require_once('bookmarksHelper.php');
|
||||||
addBookmark($_GET['url']);
|
addBookmark($_GET['url'], '', 'Read-Later');
|
||||||
|
|
||||||
include 'templates/addBm.php';
|
include 'templates/addBm.php';
|
||||||
|
|
|
@ -126,12 +126,12 @@ function updateBookmarksList(bookmark) {
|
||||||
$('.bookmarks_list').append(
|
$('.bookmarks_list').append(
|
||||||
'<div class="bookmark_single" data-id="' + bookmark.id +'" >' +
|
'<div class="bookmark_single" data-id="' + bookmark.id +'" >' +
|
||||||
'<p class="bookmark_actions">' +
|
'<p class="bookmark_actions">' +
|
||||||
'<span class="bookmark_delete">' +
|
|
||||||
'<img class="svg" src="'+OC.imagePath('core', 'actions/delete')+'" title="Delete">' +
|
|
||||||
'</span> ' +
|
|
||||||
'<span class="bookmark_edit">' +
|
'<span class="bookmark_edit">' +
|
||||||
'<img class="svg" src="'+OC.imagePath('core', 'actions/rename')+'" title="Edit">' +
|
'<img class="svg" src="'+OC.imagePath('core', 'actions/rename')+'" title="Edit">' +
|
||||||
'</span>' +
|
'</span>' +
|
||||||
|
'<span class="bookmark_delete">' +
|
||||||
|
'<img class="svg" src="'+OC.imagePath('core', 'actions/delete')+'" title="Delete">' +
|
||||||
|
'</span> ' +
|
||||||
'</p>' +
|
'</p>' +
|
||||||
'<p class="bookmark_title">'+
|
'<p class="bookmark_title">'+
|
||||||
'<a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a>' +
|
'<a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a>' +
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
#editor{
|
#editor{
|
||||||
position: absoloute;
|
position: fixed;
|
||||||
display: block;
|
display: block;
|
||||||
top: 2em;
|
top: 6.5em;
|
||||||
|
left: 12.5em;
|
||||||
}
|
}
|
||||||
#editorwrapper{
|
#editorwrapper{
|
||||||
position: absoloute;
|
position: absoloute;
|
||||||
|
|
|
@ -172,6 +172,7 @@ function giveEditorFocus(){
|
||||||
function showFileEditor(dir,filename){
|
function showFileEditor(dir,filename){
|
||||||
if(!editorIsShown()){
|
if(!editorIsShown()){
|
||||||
// Loads the file editor and display it.
|
// Loads the file editor and display it.
|
||||||
|
$('#content').append('<div id="editor"></div>');
|
||||||
var data = $.getJSON(
|
var data = $.getJSON(
|
||||||
OC.filePath('files_texteditor','ajax','loadfile.php'),
|
OC.filePath('files_texteditor','ajax','loadfile.php'),
|
||||||
{file:filename,dir:dir},
|
{file:filename,dir:dir},
|
||||||
|
@ -273,10 +274,10 @@ $(document).ready(function(){
|
||||||
var dir=text.substr(0,text.length-file.length-1);
|
var dir=text.substr(0,text.length-file.length-1);
|
||||||
showFileEditor(dir,file);
|
showFileEditor(dir,file);
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
// Binds the file save and close editor events, and gotoline button
|
// Binds the file save and close editor events, and gotoline button
|
||||||
bindControlEvents();
|
bindControlEvents();
|
||||||
|
$('#editor').remove();
|
||||||
// Binds the save keyboard shortcut events
|
// Binds the save keyboard shortcut events
|
||||||
//$(document).unbind('keydown').bind('keydown',checkForSaveKeyPress);
|
//$(document).unbind('keydown').bind('keydown',checkForSaveKeyPress);
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue