Slide prototype
|
@ -1089,7 +1089,7 @@ define([
|
||||||
changes: parseChanges(obj.changes),
|
changes: parseChanges(obj.changes),
|
||||||
changesIndex: ooChannel.cpIndex || 0,
|
changesIndex: ooChannel.cpIndex || 0,
|
||||||
locks: getUserLock(getId()),
|
locks: getUserLock(getId()),
|
||||||
excelAdditionalInfo: null
|
excelAdditionalInfo: obj.excelAdditionalInfo
|
||||||
}, null, function (err, hash) {
|
}, null, function (err, hash) {
|
||||||
if (err) {
|
if (err) {
|
||||||
return void console.error(err);
|
return void console.error(err);
|
||||||
|
@ -1164,6 +1164,17 @@ define([
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case "cursor":
|
||||||
|
cursor.updateCursor({
|
||||||
|
type: "cursor",
|
||||||
|
messages: [{
|
||||||
|
cursor: obj.cursor,
|
||||||
|
time: +new Date(),
|
||||||
|
user: myUniqueOOId,
|
||||||
|
useridoriginal: myOOId
|
||||||
|
}]
|
||||||
|
});
|
||||||
|
break;
|
||||||
case "getLock":
|
case "getLock":
|
||||||
handleLock(obj, send);
|
handleLock(obj, send);
|
||||||
break;
|
break;
|
||||||
|
@ -1498,6 +1509,12 @@ define([
|
||||||
|
|
||||||
APP.loadingImage = 0;
|
APP.loadingImage = 0;
|
||||||
APP.getImageURL = function(name, callback) {
|
APP.getImageURL = function(name, callback) {
|
||||||
|
if (name && /^data:image/.test(name)) {
|
||||||
|
var b = Util.dataURIToBlob(name);
|
||||||
|
var url = URL.createObjectURL(blob);
|
||||||
|
return void callback(url);
|
||||||
|
}
|
||||||
|
|
||||||
var mediasSources = getMediasSources();
|
var mediasSources = getMediasSources();
|
||||||
var data = mediasSources[name];
|
var data = mediasSources[name];
|
||||||
|
|
||||||
|
@ -2528,6 +2545,15 @@ define([
|
||||||
initializing = false;
|
initializing = false;
|
||||||
common.openPadChat(APP.onLocal);
|
common.openPadChat(APP.onLocal);
|
||||||
|
|
||||||
|
if (!readOnly) {
|
||||||
|
common.openCursorChannel(APP.onLocal);
|
||||||
|
cursor = common.createCursor(APP.onLocal);
|
||||||
|
cursor.onCursorUpdate(function (data) {
|
||||||
|
if (!data || !data.cursor) { return; }
|
||||||
|
ooChannel.send(data.cursor);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (APP.startWithTemplate) {
|
if (APP.startWithTemplate) {
|
||||||
var template = APP.startWithTemplate;
|
var template = APP.startWithTemplate;
|
||||||
loadTemplate(template.href, template.password, template.content);
|
loadTemplate(template.href, template.password, template.content);
|
||||||
|
|
After Width: | Height: | Size: 41 KiB |
After Width: | Height: | Size: 119 KiB |
After Width: | Height: | Size: 91 KiB |
After Width: | Height: | Size: 128 KiB |
After Width: | Height: | Size: 34 KiB |
After Width: | Height: | Size: 504 KiB |
After Width: | Height: | Size: 23 KiB |
After Width: | Height: | Size: 20 KiB |
After Width: | Height: | Size: 18 KiB |
After Width: | Height: | Size: 378 KiB |
After Width: | Height: | Size: 92 KiB |
After Width: | Height: | Size: 357 KiB |
1
www/common/onlyoffice/v4/sdkjs/slide/themes/themes.js
Normal file
|
@ -0,0 +1 @@
|
||||||
|
AscCommon.g_defaultThemes = ["Blank","Basic","Classic","Official","Green leaf","Lines","Office","Safari","Dotted","Corner","Turtle"];
|
After Width: | Height: | Size: 704 B |
After Width: | Height: | Size: 837 B |
After Width: | Height: | Size: 2.2 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 1.7 KiB |
After Width: | Height: | Size: 1,001 B |
After Width: | Height: | Size: 1.8 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 870 B |
|
@ -30,6 +30,7 @@ define([
|
||||||
cursor: client.cursor
|
cursor: client.cursor
|
||||||
};
|
};
|
||||||
chan.sendMsg(JSON.stringify(data));
|
chan.sendMsg(JSON.stringify(data));
|
||||||
|
console.error(data);
|
||||||
ctx.emit('MESSAGE', data, chan.clients.filter(function (cl) {
|
ctx.emit('MESSAGE', data, chan.clients.filter(function (cl) {
|
||||||
return cl !== clientId;
|
return cl !== clientId;
|
||||||
}));
|
}));
|
||||||
|
|