Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Axing dev #3166

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified LICENSE.txt
100755 → 100644
Empty file.
1 change: 1 addition & 0 deletions apps/api/documents/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,7 @@
};

var _processSaveResult = function(result, message) {
console.log("axing _processSaveResult", result, message)
_sendCommand({
command: 'processSaveResult',
data: {
Expand Down
2 changes: 2 additions & 0 deletions apps/common/Gateway.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ if (window.Common === undefined) {
},

'setHistoryData': function(data) {
console.log("axing setHistoryData", data)
$me.trigger('sethistorydata', data);
},

Expand Down Expand Up @@ -407,6 +408,7 @@ if (window.Common === undefined) {
},

saveDocument: function(data) {
console.log("axing saveDocument", data)
data && _postMessage({
event: 'onSaveDocument',
data: data.buffer
Expand Down
2 changes: 2 additions & 0 deletions apps/common/main/lib/controller/History.js
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,9 @@ define([
}

var data = opts.data;

var historyStore = this.getApplication().getCollection('Common.Collections.HistoryVersions');
console.log("axing onSetHistoryData data = ", data, "\nopts = ", opts, "");
if (historyStore && data!==null) {
var rev, revisions = historyStore.findRevisions(data.version),
urlGetTime = new Date();
Expand Down
Empty file modified apps/common/main/lib/extend/Bootstrap.js
100755 → 100644
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -735,10 +735,13 @@ define([
this.api.asc_LoadDocument();
this.api.Resize();
},

// buildVersion:传入的params.asc_getBuildVersion(),来自this.licenseResult['buildVersion'],
// 在server/Common/sources/commondefines.js中有设置
// compareVersions来自哪儿。看着是检测本地文件是否都一致
// DocsAPI.DocEditor.version()是'{{PRODUCT_VERSION}}';
onServerVersion: function(buildVersion) {
if (this.changeServerVersion) return true;

console.log("onServerVersion test", DocsAPI.DocEditor.version(), buildVersion, window.compareVersions)
if (DocsAPI.DocEditor.version() !== buildVersion && !window.compareVersions) {
this.changeServerVersion = true;
Common.UI.warning({
Expand Down
2 changes: 2 additions & 0 deletions apps/documenteditor/main/app/controller/Main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2216,6 +2216,7 @@ define([
break;

case Asc.c_oAscError.ID.UpdateVersion:
// 在断开连接时更新版本错误
config.msg = this.errorUpdateVersionOnDisconnect;
config.maxwidth = 600;
break;
Expand Down Expand Up @@ -2574,6 +2575,7 @@ define([

const cur_version = this.getApplication().getController('LeftMenu').leftMenu.getMenu('about').txtVersionNum;
const cropped_version = cur_version.match(/^(\d+.\d+.\d+)/);
console.log("onServerVersion test", cur_version, buildVersion, cropped_version, window.compareVersions)
if (!window.compareVersions && (!cropped_version || cropped_version[1] !== buildVersion)) {
this.changeServerVersion = true;
Common.UI.warning({
Expand Down
1 change: 1 addition & 0 deletions apps/documenteditor/main/resources/img/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions apps/documenteditor/mobile/css/526.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/documenteditor/mobile/css/526.css.map

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions apps/documenteditor/mobile/css/964.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/documenteditor/mobile/css/964.css.map

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions apps/documenteditor/mobile/css/framework7-rtl.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/documenteditor/mobile/css/framework7-rtl.css.map

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions apps/documenteditor/mobile/css/framework7.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/documenteditor/mobile/css/framework7.css.map

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions apps/documenteditor/mobile/dist/js/526.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions apps/documenteditor/mobile/dist/js/526.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/*!
*
* * Version: 8.0.1 (build: 0)
*
*/
2 changes: 2 additions & 0 deletions apps/documenteditor/mobile/dist/js/964.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions apps/documenteditor/mobile/dist/js/964.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/*!
*
* * Version: 8.0.1 (build: 0)
*
*/
3 changes: 3 additions & 0 deletions apps/documenteditor/mobile/dist/js/app.js

Large diffs are not rendered by default.

Loading