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

Integrate bootstrap, wait for js components to load

Browse Source
This commit is contained in:
Victor Dubiniuk 2013-10-22 16:18:03 +03:00
parent 8eea7805e7
commit efcc0ed3f9
2 changed files with 48 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/3rdparty/webodf/webodf_bootstrap.js vendored
View File

@ -1,20 +0,0 @@
/*globals navigator,dojoConfig */
var usedLocale = "C";
if (navigator && navigator.language.match(/^(de)/)) {
usedLocale = navigator.language.substr(0,2);
}
dojoConfig = {
locale: usedLocale,
paths: {
"webodf/editor": OC.appswebroots.documents + "/js/3rdparty/webodf/editor",
"dijit": OC.appswebroots.documents + "/js/3rdparty/resources/dijit",
"dojox": OC.appswebroots.documents + "/js/3rdparty/resources/dojox",
"dojo": OC.appswebroots.documents + "/js/3rdparty/resources/dojo",
"resources": OC.appswebroots.documents + "/js/3rdparty/resources"
}
};
//alert("bootstrap hello");

42
js/documents.js
View File

@ -6,6 +6,7 @@ var documentsMain = {
isEditormode : false,
useUnstable : false,
isGuest : false,
ready :false,
UI : {
/* Overlay HTML */
@ -87,16 +88,17 @@ var documentsMain = {
},
onStartup: function() {
var fileId;
"use strict";
documentsMain.useUnstable = $('#webodf-unstable').val()==='true';
documentsMain.UI.init();
if (!OC.currentUser){
documentsMain.isGuest = true;
var fileId;
} else {
// Does anything indicate that we need to autostart a session?
var fileId = parent.location.hash.replace(/\W*/g, '');
fileId = parent.location.hash.replace(/\W*/g, '');
}
if (!fileId){
@ -106,13 +108,12 @@ var documentsMain = {
}
OC.addScript('documents', '3rdparty/webodf/dojo-amalgamation', function() {
OC.addScript('documents', '3rdparty/webodf/webodf-debug').done(function() {
// preload stuff in the background
require({}, ["dojo/ready"], function(ready) {
ready(function() {
require({}, ["webodf/editor/Editor"], function(Editor) {
documentsMain.ready = true;
if (fileId){
documentsMain.prepareSession();
documentsMain.joinSession(fileId);
@ -121,7 +122,6 @@ var documentsMain = {
});
});
});
});
},
prepareSession : function(){
@ -146,6 +146,13 @@ var documentsMain = {
return;
}
//Wait for 3 sec if editor is still loading
if (!documentsMain.ready){
setTimeout(function(){ documentsMain.initSession(response) }, 3000);
console.log('Waiting for the editor to start...');
return;
}
require({ }, ["webodf/editor/server/owncloud/ServerFactory", "webodf/editor/Editor"], function (ServerFactory, Editor) {
// fade out file list and show WebODF canvas
$('#content').fadeOut('slow').promise().done(function() {
@ -335,14 +342,36 @@ var documentsMain = {
};
//web odf bootstrap code. Added here to reduce number of requests
/*globals navigator,dojoConfig */
var usedLocale = "C";
if (navigator && navigator.language.match(/^(de)/)) {
usedLocale = navigator.language.substr(0,2);
}
dojoConfig = {
locale: usedLocale,
paths: {
"webodf/editor": OC.appswebroots.documents + "/js/3rdparty/webodf/editor",
"dijit": OC.appswebroots.documents + "/js/3rdparty/resources/dijit",
"dojox": OC.appswebroots.documents + "/js/3rdparty/resources/dojox",
"dojo": OC.appswebroots.documents + "/js/3rdparty/resources/dojo",
"resources": OC.appswebroots.documents + "/js/3rdparty/resources"
}
};
//init
$(document).ready(function() {
"use strict";
$('.documentslist').on('click', 'li:not(.add-document)', function(event) {
event.preventDefault();
if (documentsMain.isEditorMode){
return;
}
documentsMain.prepareSession();
if ($(this).attr('data-id')){
documentsMain.joinSession($(this).attr('data-id'));
@ -353,6 +382,7 @@ $(document).ready(function() {
$(document.body).on('click', '#odf-invite', documentsMain.onInvite);
$(document.body).on('click', '#odf-join', function(event){
event.preventDefault();
// !Login page mess wih WebODF toolbars
$(document.body).attr('id', 'body-user');
$('header,footer').hide();
@ -367,5 +397,5 @@ $(document).ready(function() {
file_upload_start.on('fileuploaddone', documentsMain.show);
//TODO when ending a session as the last user close session?
OC.addScript('documents', '3rdparty/webodf/webodf_bootstrap', documentsMain.onStartup);
OC.addScript('documents', '3rdparty/webodf/dojo-amalgamation', documentsMain.onStartup);
});