DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some cleanup

Browse Source
This commit is contained in:
Victor Dubiniuk 2013-08-18 17:21:29 +03:00 committed by Tobias Hintze
parent 922cdec6b8
commit 9d7983d13c
2 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
css/style.css
View File

@ -5,23 +5,7 @@
.documentslist tr td { padding:5px; } .documentslist tr td { padding:5px; }
#office-content{ #office-content{
padding-top: 3em; padding-top: 3em;
}
#office-content.wide{
padding-left: 0;
}
#editing-sessions{
position:absolute;
left:0;
padding:5px;
top:3em;
width:150px;
overflow:hidden;
}
#editing-sessions div{
margin:5px 0;
} }
#odf_close{ #odf_close{

16
js/office.js
View File

@ -19,7 +19,7 @@ var officeMain = {
}); });
}); });
}); });
setInterval(officeMain.updateInfo, 10000); //setInterval(officeMain.updateInfo, 10000);
}, },
initSession: function(response) { initSession: function(response) {
"use strict"; "use strict";
@ -28,7 +28,7 @@ var officeMain = {
var doclocation = response.es_id; var doclocation = response.es_id;
// fade out file list and show WebODF canvas // fade out file list and show WebODF canvas
$('.documentslist, #emptyfolder, #editing-sessions').fadeOut('slow').promise().done(function() { $('.documentslist, #emptyfolder').fadeOut('slow').promise().done(function() {
// odf action toolbar // odf action toolbar
var odfToolbarHtml = var odfToolbarHtml =
'<div id="odf-toolbar">' + '<div id="odf-toolbar">' +
@ -42,7 +42,6 @@ var officeMain = {
'</div>'; '</div>';
$('#controls').append(odfToolbarHtml); $('#controls').append(odfToolbarHtml);
$('#office-content').addClass('wide');
var memberId, odfelement, odfcanvas, canvashtml = var memberId, odfelement, odfcanvas, canvashtml =
'<div id = "mainContainer" class="claro" style="">' + '<div id = "mainContainer" class="claro" style="">' +
' <div id = "editor">' + ' <div id = "editor">' +
@ -104,7 +103,6 @@ var officeMain = {
officeMain.initSession officeMain.initSession
); );
}, },
updateInfo : function(){ updateInfo : function(){
var fileIds = []; var fileIds = [];
@ -126,10 +124,6 @@ var officeMain = {
} }
); );
}, },
updateSessions: function() {
$('#editing-sessions').load(OC.Router.generate('office_session_listhtml'), {});
},
onInvite: function(event) { onInvite: function(event) {
event.preventDefault(); event.preventDefault();
@ -155,9 +149,8 @@ var officeMain = {
$('#mainContainer').remove(); $('#mainContainer').remove();
$('#odf-canvas').remove(); $('#odf-canvas').remove();
$('.actions,#file_access_panel').fadeIn('slow'); $('.actions,#file_access_panel').fadeIn('slow');
$('.documentslist, #emptyfolder, #editing-sessions').fadeIn('slow'); $('.documentslist, #emptyfolder').fadeIn('slow');
$(document.body).removeClass('claro'); $(document.body).removeClass('claro');
$('#office-content').removeClass('wide');
}); });
}); });
} }
@ -175,8 +168,7 @@ $(document).ready(function() {
event.preventDefault(); event.preventDefault();
if ($(this).attr('data-esid')){ if ($(this).attr('data-esid')){
officeMain.joinSession($(this).attr('data-esid')); officeMain.joinSession($(this).attr('data-esid'));
} } else if ($(this).attr('data-file')){
if ($(this).attr('data-file')){
officeMain.startSession($(this).attr('data-file')); officeMain.startSession($(this).attr('data-file'));
} }
}); });