Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'release/v7.2.0' into fix/bugfix

Browse source
This commit is contained in:
Julia Radzhabova 2022-06-06 20:37:48 +03:00
parent 6e34174770 2a55a454c5
commit 821819c906
6 changed files with 105 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
apps/common/mobile/utils/CThumbnailLoader.js Normal file
View file

@ -0,0 +1,98 @@
class CThumbnailLoader {
constructor() {
this.binaryFormat = null;
this.data = null;
this.width = 0;
this.heightOne = 0;
}
load(url, callback) {
if (!callback)
return;
let xhr = new XMLHttpRequest();
xhr.open('GET', url + ".bin", true);
xhr.responseType = 'arraybuffer';
if (xhr.overrideMimeType)
xhr.overrideMimeType('text/plain; charset=x-user-defined');
else xhr.setRequestHeader('Accept-Charset', 'x-user-defined');
xhr.onload = e => {
// TODO: check errors
this.binaryFormat = e.target.response;
callback();
};
xhr.send(null);
}
#openBinary(arrayBuffer) {
//var t1 = performance.now();
const binaryAlpha = new Uint8Array(arrayBuffer);
this.width = (binaryAlpha[0] << 24) | (binaryAlpha[1] << 16) | (binaryAlpha[2] << 8) | (binaryAlpha[3] << 0);
this.heightOne = (binaryAlpha[4] << 24) | (binaryAlpha[5] << 16) | (binaryAlpha[6] << 8) | (binaryAlpha[7] << 0);
const count = (binaryAlpha[8] << 24) | (binaryAlpha[9] << 16) | (binaryAlpha[10] << 8) | (binaryAlpha[11] << 0);
const height = count * this.heightOne;
this.data = new Uint8ClampedArray(4 * this.width * height);
var binaryIndex = 12;
var imagePixels = this.data;
var index = 0;
var len0 = 0;
var tmpValue = 0;
while (binaryIndex < binaryAlpha.length) {
tmpValue = binaryAlpha[binaryIndex++];
if (0 == tmpValue) {
len0 = binaryAlpha[binaryIndex++];
while (len0 > 0) {
len0--;
imagePixels[index] = imagePixels[index + 1] = imagePixels[index + 2] = 255;
imagePixels[index + 3] = 0; // this value is already 0.
index += 4;
}
} else {
imagePixels[index] = imagePixels[index + 1] = imagePixels[index + 2] = 255 - tmpValue;
imagePixels[index + 3] = tmpValue;
index += 4;
}
}
//var t2 = performance.now();
//console.log(t2 - t1);
};
getImage = function(index, canvas, ctx) {
//var t1 = performance.now();
if (!canvas) {
canvas = document.createElement("canvas");
canvas.width = this.width;
canvas.height = this.heightOne;
canvas.style.width = iconWidth + "px";
canvas.style.height = iconHeight + "px";
ctx = canvas.getContext("2d");
}
if (!this.data) {
this.#openBinary(this.binaryFormat);
delete this.binaryFormat;
}
let dataTmp = ctx.createImageData(this.width, this.heightOne);
const sizeImage = 4 * this.width * this.heightOne;
dataTmp.data.set(new Uint8ClampedArray(this.data.buffer, index * sizeImage, sizeImage));
ctx.putImageData(dataTmp, 0, 0);
//var t2 = performance.now();
//console.log(t2 - t1);
return canvas;
};
};
export default CThumbnailLoader;

98
apps/common/mobile/utils/utils.js
View file

@ -127,102 +127,4 @@ define([
}, 500); }, 500);
} }
}; };
Common.Utils.CThumbnailLoader = function () {
this.image = null;
this.binaryFormat = null;
this.data = null;
this.width = 0;
this.height = 0;
this.heightOne = 0;
this.count = 0;
this.load = function(url, callback) {
if (!callback)
return;
var me = this;
var xhr = new XMLHttpRequest();
xhr.open('GET', url + ".bin", true);
xhr.responseType = 'arraybuffer';
if (xhr.overrideMimeType)
xhr.overrideMimeType('text/plain; charset=x-user-defined');
else xhr.setRequestHeader('Accept-Charset', 'x-user-defined');
xhr.onload = function() {
// TODO: check errors
me.binaryFormat = this.response;
callback();
};
xhr.send(null);
};
this.openBinary = function(arrayBuffer) {
//var t1 = performance.now();
const binaryAlpha = new Uint8Array(arrayBuffer);
this.width = (binaryAlpha[0] << 24) | (binaryAlpha[1] << 16) | (binaryAlpha[2] << 8) | (binaryAlpha[3] << 0);
this.heightOne = (binaryAlpha[4] << 24) | (binaryAlpha[5] << 16) | (binaryAlpha[6] << 8) | (binaryAlpha[7] << 0);
this.count = (binaryAlpha[8] << 24) | (binaryAlpha[9] << 16) | (binaryAlpha[10] << 8) | (binaryAlpha[11] << 0);
this.height = this.count * this.heightOne;
this.data = new Uint8ClampedArray(4 * this.width * this.height);
var binaryIndex = 12;
var imagePixels = this.data;
var index = 0;
var len0 = 0;
var tmpValue = 0;
while (binaryIndex < binaryAlpha.length) {
tmpValue = binaryAlpha[binaryIndex++];
if (0 == tmpValue) {
len0 = binaryAlpha[binaryIndex++];
while (len0 > 0) {
len0--;
imagePixels[index] = imagePixels[index + 1] = imagePixels[index + 2] = 255;
imagePixels[index + 3] = 0; // this value is already 0.
index += 4;
}
} else {
imagePixels[index] = imagePixels[index + 1] = imagePixels[index + 2] = 255 - tmpValue;
imagePixels[index + 3] = tmpValue;
index += 4;
}
}
//var t2 = performance.now();
//console.log(t2 - t1);
};
this.getImage = function(index, canvas, ctx) {
//var t1 = performance.now();
if (!canvas) {
canvas = document.createElement("canvas");
canvas.width = this.width;
canvas.height = this.heightOne;
canvas.style.width = iconWidth + "px";
canvas.style.height = iconHeight + "px";
ctx = canvas.getContext("2d");
}
if (!this.data) {
this.openBinary(this.binaryFormat);
delete this.binaryFormat;
}
var dataTmp = ctx.createImageData(this.width, this.heightOne);
const sizeImage = 4 * this.width * this.heightOne;
dataTmp.data.set(new Uint8ClampedArray(this.data.buffer, index * sizeImage, sizeImage));
ctx.putImageData(dataTmp, 0, 0);
//var t2 = performance.now();
//console.log(t2 - t1);
return canvas;
};
};
}); });

3
apps/documenteditor/mobile/src/store/textSettings.js
View file

@ -1,4 +1,5 @@
import {action, observable, computed, makeObservable} from 'mobx'; import {action, observable, computed, makeObservable} from 'mobx';
import CThumbnailLoader from '../../../../common/mobile/utils/CThumbnailLoader';
export class storeTextSettings { export class storeTextSettings {
constructor() { constructor() {
@ -129,7 +130,7 @@ export class storeTextSettings {
} }
loadSprite() { loadSprite() {
this.spriteThumbs = new Common.Utils.CThumbnailLoader(); this.spriteThumbs = new CThumbnailLoader();
this.spriteThumbs.load(this.thumbs[this.thumbIdx].path, () => { this.spriteThumbs.load(this.thumbs[this.thumbIdx].path, () => {
this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1; this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1;
}); });

3
apps/presentationeditor/mobile/src/store/textSettings.js
View file

@ -1,4 +1,5 @@
import {action, observable, computed, makeObservable} from 'mobx'; import {action, observable, computed, makeObservable} from 'mobx';
import CThumbnailLoader from '../../../../common/mobile/utils/CThumbnailLoader';
export class storeTextSettings { export class storeTextSettings {
constructor() { constructor() {
@ -133,7 +134,7 @@ export class storeTextSettings {
} }
loadSprite() { loadSprite() {
this.spriteThumbs = new Common.Utils.CThumbnailLoader(); this.spriteThumbs = new CThumbnailLoader();
this.spriteThumbs.load(this.thumbs[this.thumbIdx].path, () => { this.spriteThumbs.load(this.thumbs[this.thumbIdx].path, () => {
this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1; this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1;
}); });

3
apps/spreadsheeteditor/main/app/view/ViewTab.js
View file

@ -421,8 +421,7 @@ define([
Common.NotificationCenter.on('uitheme:countchanged', _fill_themes.bind(me)); Common.NotificationCenter.on('uitheme:countchanged', _fill_themes.bind(me));
_fill_themes.call(me); _fill_themes.call(me);
if (me.view.btnInterfaceTheme.menu.items.length) { if (me.btnInterfaceTheme.menu.items.length) {
me.btnInterfaceTheme.setMenu(new Common.UI.Menu({items: menuItems}));
me.btnInterfaceTheme.menu.on('item:click', _.bind(function (menu, item) { me.btnInterfaceTheme.menu.on('item:click', _.bind(function (menu, item) {
var value = item.value; var value = item.value;
Common.UI.Themes.setTheme(value); Common.UI.Themes.setTheme(value);

3
apps/spreadsheeteditor/mobile/src/store/textSettings.js
View file

@ -1,4 +1,5 @@
import {action, observable, makeObservable, computed} from 'mobx'; import {action, observable, makeObservable, computed} from 'mobx';
import CThumbnailLoader from '../../../../common/mobile/utils/CThumbnailLoader';
export class storeTextSettings { export class storeTextSettings {
constructor() { constructor() {
@ -133,7 +134,7 @@ export class storeTextSettings {
} }
loadSprite() { loadSprite() {
this.spriteThumbs = new Common.Utils.CThumbnailLoader(); this.spriteThumbs = new CThumbnailLoader();
this.spriteThumbs.load(this.thumbs[this.thumbIdx].path, () => { this.spriteThumbs.load(this.thumbs[this.thumbIdx].path, () => {
this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1; this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1;
}); });