diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js
index 2883fa875..690512e71 100644
--- a/apps/common/main/lib/controller/ReviewChanges.js
+++ b/apps/common/main/lib/controller/ReviewChanges.js
@@ -80,7 +80,6 @@ define([
},
onLaunch: function () {
this.collection = this.getApplication().getCollection('Common.Collections.ReviewChanges');
- this.popoverChanges = new Common.Collections.ReviewChanges();
this.userCollection = this.getApplication().getCollection('Common.Collections.Users');
this._state = {posx: -1000, posy: -1000, popoverVisible: false};
@@ -107,13 +106,17 @@ define([
},
setMode: function(mode) {
- if ( mode.canReview || mode.isReviewOnly ) {
- this.view = this.createView('Common.Views.ReviewChanges', {
- // store : this.collection,
- popoverChanges : this.popoverChanges
- });
+ this.appConfig = mode;
+ if ( mode.canReview ) {
+ this.popoverChanges = new Common.Collections.ReviewChanges();
}
+ this.view = this.createView('Common.Views.ReviewChanges', {
+ // store : this.collection,
+ popoverChanges : this.popoverChanges,
+ mode : mode
+ });
+
return this;
},
@@ -137,7 +140,7 @@ define([
this.getPopover().show(animate, lock, lockUser);
- if (!this.view.appConfig.isReviewOnly && this._state.lock !== lock) {
+ if (!this.appConfig.isReviewOnly && this._state.lock !== lock) {
this.view.btnAccept.setDisabled(lock==true);
this.view.btnReject.setDisabled(lock==true);
this._state.lock = lock;
@@ -457,10 +460,10 @@ define([
},
onTurnPreview: function(state) {
- if ( this.view.appConfig.isReviewOnly ) {
+ if ( this.appConfig.isReviewOnly ) {
this.view.turnChanges(true);
} else
- if ( this.view.appConfig.canReview ) {
+ if ( this.appConfig.canReview ) {
state = (state == 'on');
this.api.asc_SetTrackRevisions(state);
@@ -491,7 +494,6 @@ define([
if ( config.canReview ) {
var me = this;
- this.appConfig = config;
(new Promise(function (resolve) {
resolve();
})).then(function () {
diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js
index d64ab0ada..fd375f505 100644
--- a/apps/common/main/lib/view/ReviewChanges.js
+++ b/apps/common/main/lib/view/ReviewChanges.js
@@ -416,11 +416,11 @@ define([
'' +
'' +
'' +
- '' +
+ '' +
'' +
'' +
'
' +
- '' +
+ '' +
'' +
'' +
'' +
@@ -432,40 +432,43 @@ define([
function setEvents() {
var me = this;
- this.btnPrev.on('click', function (e) {
- me.fireEvent('reviewchange:preview', [me.btnPrev, 'prev']);
- });
- this.btnNext.on('click', function (e) {
- me.fireEvent('reviewchange:preview', [me.btnNext, 'next']);
- });
+ if ( me.appConfig.canReview ) {
+ this.btnPrev.on('click', function (e) {
+ me.fireEvent('reviewchange:preview', [me.btnPrev, 'prev']);
+ });
- this.btnAccept.on('click', function (e) {
- me.fireEvent('reviewchange:accept', [me.btnAccept, 'current']);
- });
+ this.btnNext.on('click', function (e) {
+ me.fireEvent('reviewchange:preview', [me.btnNext, 'next']);
+ });
- this.btnAccept.menu.on('item:click', function (menu, item, e) {
- me.fireEvent('reviewchange:accept', [menu, item]);
- });
+ this.btnAccept.on('click', function (e) {
+ me.fireEvent('reviewchange:accept', [me.btnAccept, 'current']);
+ });
- this.btnReject.on('click', function (e) {
- me.fireEvent('reviewchange:reject', [me.btnReject, 'current']);
- });
+ this.btnAccept.menu.on('item:click', function (menu, item, e) {
+ me.fireEvent('reviewchange:accept', [menu, item]);
+ });
- this.btnReject.menu.on('item:click', function (menu, item, e) {
- me.fireEvent('reviewchange:reject', [menu, item]);
- });
+ this.btnReject.on('click', function (e) {
+ me.fireEvent('reviewchange:reject', [me.btnReject, 'current']);
+ });
- function _click_turnpreview(btn, e) {
- if ( me.appConfig.canReview ) {
- Common.NotificationCenter.trigger('reviewchanges:turn', btn.pressed ? 'on' : 'off');
- }
- };
+ this.btnReject.menu.on('item:click', function (menu, item, e) {
+ me.fireEvent('reviewchange:reject', [menu, item]);
+ });
- this.btnsTurnReview.forEach(function(button) {
- button.on('click', _click_turnpreview.bind(me));
- Common.NotificationCenter.trigger('edit:complete', me);
- });
+ function _click_turnpreview(btn, e) {
+ if (me.appConfig.canReview) {
+ Common.NotificationCenter.trigger('reviewchanges:turn', btn.pressed ? 'on' : 'off');
+ }
+ };
+
+ this.btnsTurnReview.forEach(function (button) {
+ button.on('click', _click_turnpreview.bind(me));
+ Common.NotificationCenter.trigger('edit:complete', me);
+ });
+ }
this.btnsSpelling.forEach(function(button) {
button.on('click', function (b, e) {
@@ -480,7 +483,7 @@ define([
}
return {
- el: '#review-changes-panel',
+ // el: '#review-changes-panel',
options: {},
@@ -489,40 +492,43 @@ define([
// this.store = this.options.store;
// this.popoverChanges = this.options.popoverChanges;
+ this.appConfig = options.mode;
- this.btnPrev = new Common.UI.Button({
- cls: 'btn-toolbar x-huge icon-top',
- iconCls: 'review-prev',
- caption: this.txtPrev
- });
+ if ( this.appConfig.canReview ) {
+ this.btnPrev = new Common.UI.Button({
+ cls: 'btn-toolbar x-huge icon-top',
+ iconCls: 'review-prev',
+ caption: this.txtPrev
+ });
- this.btnNext = new Common.UI.Button({
- cls: 'btn-toolbar x-huge icon-top',
- iconCls: 'review-next',
- caption: this.txtNext
- });
+ this.btnNext = new Common.UI.Button({
+ cls: 'btn-toolbar x-huge icon-top',
+ iconCls: 'review-next',
+ caption: this.txtNext
+ });
- this.btnAccept = new Common.UI.Button({
- cls: 'btn-toolbar x-huge icon-top',
- caption: this.txtAccept,
- split: true,
- iconCls: 'review-save'
- });
+ this.btnAccept = new Common.UI.Button({
+ cls: 'btn-toolbar x-huge icon-top',
+ caption: this.txtAccept,
+ split: true,
+ iconCls: 'review-save'
+ });
- this.btnReject = new Common.UI.Button({
- cls: 'btn-toolbar x-huge icon-top',
- caption: this.txtReject,
- split: true,
- iconCls: 'review-deny'
- });
+ this.btnReject = new Common.UI.Button({
+ cls: 'btn-toolbar x-huge icon-top',
+ caption: this.txtReject,
+ split: true,
+ iconCls: 'review-deny'
+ });
- this.btnTurnOn = new Common.UI.Button({
- cls: 'btn-toolbar x-huge icon-top',
- iconCls: 'btn-ic-review',
- caption: this.txtTurnon,
- enableToggle: true
- });
- this.btnsTurnReview = [this.btnTurnOn];
+ this.btnTurnOn = new Common.UI.Button({
+ cls: 'btn-toolbar x-huge icon-top',
+ iconCls: 'btn-ic-review',
+ caption: this.txtTurnon,
+ enableToggle: true
+ });
+ this.btnsTurnReview = [this.btnTurnOn];
+ }
this.btnSetSpelling = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
@@ -553,63 +559,77 @@ define([
(new Promise(function (accept, reject) {
accept();
})).then(function(){
- me.appConfig = config;
+ if ( config.canReview ) {
+ me.btnPrev.updateHint(me.hintPrev);
+ me.btnNext.updateHint(me.hintNext);
+ me.btnTurnOn.updateHint(me.textChangesOn);
+
+ me.btnAccept.setMenu(
+ new Common.UI.Menu({
+ items: [
+ {
+ caption: me.txtAcceptCurrent,
+ value: 'current'
+ },
+ {
+ caption: me.txtAcceptAll,
+ value: 'all'
+ }
+ ]
+ })
+ );
+
+ me.btnReject.setMenu(
+ new Common.UI.Menu({
+ items: [
+ {
+ caption: me.txtRejectCurrent,
+ value: 'current'
+ },
+ {
+ caption: me.txtRejectAll,
+ value: 'all'
+ }
+ ]
+ })
+ );
+
+ me.btnAccept.setDisabled(config.isReviewOnly);
+ me.btnReject.setDisabled(config.isReviewOnly);
+ } else {
+ me.$el.find('.separator.review')
+ .hide()
+ .next('.group').hide();
+ }
+
+ if ( !config.canComments ) {
+ $('.separator.comments', me.$el)
+ .hide()
+ .next('.group').hide();
+ }
- me.btnPrev.updateHint(me.hintPrev);
- me.btnNext.updateHint(me.hintNext);
- me.btnTurnOn.updateHint(me.textChangesOn);
me.btnDocLang.updateHint(me.tipSetDocLang);
me.btnSetSpelling.updateHint(me.tipSetSpelling);
- me.btnAccept.setMenu(
- new Common.UI.Menu({
- items: [
- {
- caption: me.txtAcceptCurrent,
- value: 'current'
- },
- {
- caption: me.txtAcceptAll,
- value: 'all'
- }
- ]
- })
- );
-
- me.btnReject.setMenu(
- new Common.UI.Menu({
- items: [
- {
- caption: me.txtRejectCurrent,
- value: 'current'
- },
- {
- caption: me.txtRejectAll,
- value: 'all'
- }
- ]
- })
- );
-
- me.btnAccept.setDisabled(config.isReviewOnly);
- me.btnReject.setDisabled(config.isReviewOnly);
-
setEvents.call(me);
});
},
getPanel: function () {
- var _html = $(_.template( template, {} ));
+ this.$el = $(_.template( template, {} ));
- this.btnPrev.render(_html.find('#btn-change-prev'));
- this.btnNext.render(_html.find('#btn-change-next'));
- this.btnAccept.render(_html.find('#btn-change-accept'));
- this.btnReject.render(_html.find('#btn-change-reject'));
- this.btnTurnOn.render(_html.find('#btn-review-on'));
- this.btnSetSpelling.render(_html.find('#slot-btn-spelling'));
- this.btnDocLang.render(_html.find('#slot-set-lang'));
+ if ( this.appConfig.canReview ) {
+ this.btnPrev.render(this.$el.find('#btn-change-prev'));
+ this.btnNext.render(this.$el.find('#btn-change-next'));
+ this.btnAccept.render(this.$el.find('#btn-change-accept'));
+ this.btnReject.render(this.$el.find('#btn-change-reject'));
+ this.btnTurnOn.render(this.$el.find('#btn-review-on'));
+ }
- return _html;
+ this.btnSetSpelling.render(this.$el.find('#slot-btn-spelling'));
+ this.btnDocLang.render(this.$el.find('#slot-set-lang'));
+
+ return this.$el;
},
show: function () {
diff --git a/apps/documenteditor/main/app/controller/Statusbar.js b/apps/documenteditor/main/app/controller/Statusbar.js
index 2ac4a4c14..0119c9316 100644
--- a/apps/documenteditor/main/app/controller/Statusbar.js
+++ b/apps/documenteditor/main/app/controller/Statusbar.js
@@ -43,8 +43,7 @@
define([
'core',
'documenteditor/main/app/view/Statusbar',
- 'common/main/lib/util/LanguageInfo',
- 'common/main/lib/view/ReviewChanges'
+ 'common/main/lib/util/LanguageInfo'
], function () {
'use strict';
@@ -89,18 +88,18 @@ define([
$('.statusbar #label-zoom').css('min-width', 70);
+ var review = DE.getController('Common.Controllers.ReviewChanges').getView();
if ( cfg.canReview ) {
- var review = DE.getController('Common.Controllers.ReviewChanges').getView();
me.btnTurnReview = review.getButton('turn', 'statusbar');
me.btnTurnReview.render( me.statusbar.$layout.find('#btn-doc-review') );
-
- me.btnSpelling = review.getButton('spelling', 'statusbar');
- me.btnSpelling.render( me.statusbar.$layout.find('#btn-doc-spell') );
} else {
me.statusbar.$el.find('.el-review').hide();
}
- if ( !cfg.isEdit ) {
+ if ( cfg.isEdit ) {
+ me.btnSpelling = review.getButton('spelling', 'statusbar');
+ me.btnSpelling.render( me.statusbar.$layout.find('#btn-doc-spell') );
+ } else {
me.statusbar.$el.find('.el-edit')['hide']();
}
});
diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index f79bce08d..8d3e556ae 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -2742,7 +2742,8 @@ define([
onAppShowed: function (config) {
var me = this;
- if ( config.canReview ) {
+ // if ( config.canReview )
+ {
var tab = {action: 'review', caption: 'Review'};
var $panel = DE.getController('Common.Controllers.ReviewChanges').createToolbarPanel();