Yajbir-Malik/DocumentServer-v-9.2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated application.

Browse Source
This commit is contained in:
agolybev
2015-08-17 17:19:04 +03:00
parent cd34405d7e
commit a7b9b3a979
330 changed files with 81139 additions and 172701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OfficeWeb/apps/common/main/lib/component/ComboBoxFonts.js
View File

@@ -317,13 +317,13 @@ define(["common/main/lib/component/ComboBox"], function () {
} else {
Common.UI.ComboBox.prototype.onAfterShowMenu.apply(this, arguments);
}
this.flushVisibleFontsTiles();
this.updateVisibleFontsTiles(null, 0);
},
onAfterHideMenu: function (e) {
if (this.lastValue !== this._input.val()) {
this._input.val(this.lastValue);
}
this.flushVisibleFontsTiles();
Common.UI.ComboBox.prototype.onAfterHideMenu.apply(this, arguments);
},
addItemToRecent: function (record) {

17
OfficeWeb/apps/common/main/lib/controller/History.js
View File

@@ -57,12 +57,13 @@
},
onSelectRevision: function (picker, item, record) {
var url = record.get("url"),
rev = record.get("revision");
rev = record.get("revision"),
urlGetTime = new Date();
this.currentChangeId = record.get("changeid");
this.currentArrColors = record.get("arrColors");
this.currentDocId = record.get("docId");
this.currentDocIdPrev = record.get("docIdPrev");
if (_.isEmpty(url)) {
if (_.isEmpty(url) || (urlGetTime - record.get("urlGetTime") > 5 * 60000)) {
_.delay(function () {
Common.Gateway.requestHistoryData(rev);
},
@@ -76,6 +77,10 @@
hist.asc_setCurrentChangeId(this.currentChangeId);
hist.asc_setArrColors(this.currentArrColors);
this.api.asc_showRevision(hist);
var commentsController = this.getApplication().getController("Common.Controllers.Comments");
if (commentsController) {
commentsController.onApiHideComment();
}
}
},
onSetHistoryData: function (opts) {
@@ -92,12 +97,14 @@
var data = opts.data;
var historyStore = this.getApplication().getCollection("Common.Collections.HistoryVersions");
if (historyStore && data !== null) {
var rev, revisions = historyStore.findRevisions(data.version);
var rev, revisions = historyStore.findRevisions(data.version),
urlGetTime = new Date();
if (revisions && revisions.length > 0) {
for (var i = 0; i < revisions.length; i++) {
rev = revisions[i];
rev.set("url", opts.data.url);
rev.set("urlDiff", opts.data.urlDiff);
rev.set("urlGetTime", urlGetTime);
}
}
var hist = new Asc.asc_CVersionHistory();
@@ -107,6 +114,10 @@
hist.asc_setCurrentChangeId(this.currentChangeId);
hist.asc_setArrColors(this.currentArrColors);
this.api.asc_showRevision(hist);
var commentsController = this.getApplication().getController("Common.Controllers.Comments");
if (commentsController) {
commentsController.onApiHideComment();
}
}
}
},

1
OfficeWeb/apps/common/main/lib/model/HistoryVersion.js
View File

@@ -47,6 +47,7 @@ define(["underscore", "backbone", "common/main/lib/component/BaseView"], functio
id: Common.UI.getId(),
url: "",
urlDiff: "",
urlGetTime: "",
docId: "",
docIdPrev: "",
arrColors: [],

8
OfficeWeb/apps/common/main/lib/view/About.js
View File

@@ -80,8 +80,12 @@
value = customer.address;
value && value.length ? this.lblCompanyAddress.text(value) : this.lblCompanyAddress.parents("tr").addClass("hidden");
(value = customer.mail) && value.length ? this.lblCompanyMail.attr("href", "mailto:" + value).text(value) : this.lblCompanyMail.parents("tr").addClass("hidden");
(value = customer.www) && value.length ? this.lblCompanyUrl.attr("href", "http://" + value).text(value) : this.lblCompanyUrl.parents("tr").addClass("hidden");
(value = customer.info) && value.length ? this.lblCompanyLic.text(value) : this.lblCompanyLic.parents("tr").addClass("hidden");
if ((value = customer.www) && value.length) {
var http = !/^https?:\/{2}/i.test(value) ? "http://": "";
this.lblCompanyUrl.attr("href", http + value).text(value);
} else {
this.lblCompanyUrl.parents("tr").addClass("hidden");
} (value = customer.info) && value.length ? this.lblCompanyLic.text(value) : this.lblCompanyLic.parents("tr").addClass("hidden");
(value = customer.logo) && value.length ? this.divCompanyLogo.html('<img src="' + value + '" />') : this.divCompanyLogo.parents("tr").addClass("hidden");
} else {
this.cntLicenseeInfo.addClass("hidden");

7
OfficeWeb/apps/common/main/lib/view/Header.js
View File

@@ -45,7 +45,8 @@ define(["backbone", "text!common/main/lib/template/Header.template", "core"], fu
template: _.template(headerTemplate),
events: {
"click #header-logo": function (e) {
var newDocumentPage = window.open("http://www.onlyoffice.com");
var _url = !!this.branding && !!this.branding.logo && !!this.branding.logo.url ? this.branding.logo.url : "http://www.onlyoffice.com";
var newDocumentPage = window.open(_url);
newDocumentPage && newDocumentPage.focus();
}
},
@@ -70,10 +71,10 @@ define(["backbone", "text!common/main/lib/template/Header.template", "core"], fu
setBranding: function (value) {
var element;
this.branding = value;
if (value && value.logoUrl) {
if (value && value.logo && value.logo.image) {
element = $("#header-logo");
if (element) {
element.css("background-image", 'url("' + value.logoUrl + '")');
element.css("background-image", 'url("' + value.logo.image + '")');
}
}
},