Skip to content

W
web-apps
Commit 9297531d authored by Julia Radzhabova's avatar Julia Radzhabova
Browse files
Options

Update copy/cut/paste from toolbar and context menu.

parent c964e8a8
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 66 deletions
apps/documenteditor/main/app/controller/Toolbar.js
View file @ 9297531d
......@@ -873,29 +873,21 @@ define([
onCopyPaste: function(copy, e) {
var me = this;
if (me.api) {
if (typeof window['AscDesktopEditor'] === 'object') { // AscDesktopEditor object may exists in desktop version
copy ? me.api.Copy() : me.api.Paste();
// window['AscDesktopEditor'][copy ? 'Copy' : 'Paste'](); // desktop editor's methods
} else {
var res = (copy) ? me.api.Copy() : me.api.Paste();
if (!res) {
var value = Common.localStorage.getItem("de-hide-copywarning");
if (!(value && parseInt(value) == 1)) {
(new Common.Views.CopyWarningDialog({
handler: function(dontshow) {
copy ? me.api.Copy() : me.api.Paste();
if (dontshow) Common.localStorage.setItem("de-hide-copywarning", 1);
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
})).show();
} else {
copy ? me.api.Copy() : me.api.Paste();
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
}
Common.component.Analytics.trackEvent('ToolBar', 'Copy Warning');
} else {
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
} else
Common.component.Analytics.trackEvent('ToolBar', 'Copy Warning');
}
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
},
onIncrease: function(e) {
......
apps/documenteditor/main/app/view/DocumentHolder.js
View file @ 9297531d
......@@ -1663,26 +1663,20 @@ define([
onCutCopyPaste: function(item, e) {
var me = this;
if (me.api) {
if (typeof window['AscDesktopEditor'] === 'object') {
(item.value == 'cut') ? me.api.Cut() : ((item.value == 'copy') ? me.api.Copy() : me.api.Paste());
} else {
var res = (item.value == 'cut') ? me.api.Cut() : ((item.value == 'copy') ? me.api.Copy() : me.api.Paste());
if (!res) {
var value = Common.localStorage.getItem("de-hide-copywarning");
if (!(value && parseInt(value) == 1)) {
(new Common.Views.CopyWarningDialog({
handler: function(dontshow) {
(item.value == 'cut') ? me.api.Cut() : ((item.value == 'copy') ? me.api.Copy() : me.api.Paste());
if (dontshow) Common.localStorage.setItem("de-hide-copywarning", 1);
me.fireEvent('editcomplete', me);
}
})).show();
} else {
(item.value == 'cut') ? me.api.Cut() : ((item.value == 'copy') ? me.api.Copy() : me.api.Paste());
me.fireEvent('editcomplete', me);
}
}
} else {
me.fireEvent('editcomplete', me);
}
}
me.fireEvent('editcomplete', me);
},
createDelayedElements: function() {
......
apps/presentationeditor/main/app/controller/Toolbar.js
View file @ 9297531d
......@@ -879,29 +879,21 @@ define([
onCopyPaste: function(copy, e) {
var me = this;
if (me.api) {
if (typeof window['AscDesktopEditor'] === 'object') {
copy ? me.api.Copy() : me.api.Paste();
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
} else {
var res = (copy) ? me.api.Copy() : me.api.Paste();
if (!res) {
var value = Common.localStorage.getItem("pe-hide-copywarning");
if (!(value && parseInt(value) == 1)) {
(new Common.Views.CopyWarningDialog({
handler: function(dontshow) {
copy ? me.api.Copy() : me.api.Paste();
if (dontshow) Common.localStorage.setItem("pe-hide-copywarning", 1);
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
})).show();
} else {
copy ? me.api.Copy() : me.api.Paste();
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
}
Common.component.Analytics.trackEvent('ToolBar', 'Copy Warning');
} else {
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
} else
Common.component.Analytics.trackEvent('ToolBar', 'Copy Warning');
}
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
},
onBold: function(btn, e) {
......
apps/presentationeditor/main/app/view/DocumentHolder.js
View file @ 9297531d
......@@ -834,26 +834,20 @@ define([
onCutCopyPaste: function(item, e) {
var me = this;
if (me.api) {
if (typeof window['AscDesktopEditor'] === 'object') {
(item.value == 'cut') ? me.api.Cut() : ((item.value == 'copy') ? me.api.Copy() : me.api.Paste());
} else {
var res = (item.value == 'cut') ? me.api.Cut() : ((item.value == 'copy') ? me.api.Copy() : me.api.Paste());
if (!res) {
var value = Common.localStorage.getItem("pe-hide-copywarning");
if (!(value && parseInt(value) == 1)) {
(new Common.Views.CopyWarningDialog({
handler: function(dontshow) {
(item.value == 'cut') ? me.api.Cut() : ((item.value == 'copy') ? me.api.Copy() : me.api.Paste());
if (dontshow) Common.localStorage.setItem("pe-hide-copywarning", 1);
me.fireEvent('editcomplete', me);
}
})).show();
} else {
(item.value == 'cut') ? me.api.Cut() : ((item.value == 'copy') ? me.api.Copy() : me.api.Paste());
me.fireEvent('editcomplete', me);
}
}
} else {
me.fireEvent('editcomplete', me);
}
me.fireEvent('editcomplete', me);
},
fullScreen: function(element) {
......
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file @ 9297531d
......@@ -265,25 +265,21 @@ define([
onCopyPaste: function(item) {
var me = this;
if (me.api) {
if (typeof window['AscDesktopEditor'] === 'object') {
(item.value == 'cut') ? me.api.asc_Cut() : ((item.value == 'copy') ? me.api.asc_Copy() : me.api.asc_Paste());
} else {
var res = (item.value == 'cut') ? me.api.asc_Cut() : ((item.value == 'copy') ? me.api.asc_Copy() : me.api.asc_Paste());
if (!res) {
var value = Common.localStorage.getItem("sse-hide-copywarning");
if (!(value && parseInt(value) == 1)) {
(new Common.Views.CopyWarningDialog({
handler: function(dontshow) {
(item.value == 'cut') ? me.api.asc_Cut() : ((item.value == 'copy') ? me.api.asc_Copy() : me.api.asc_Paste());
if (dontshow) Common.localStorage.setItem("sse-hide-copywarning", 1);
Common.NotificationCenter.trigger('edit:complete', me.documentHolder);
}
})).show();
} else {
(item.value == 'cut') ? me.api.asc_Cut() : ((item.value == 'copy') ? me.api.asc_Copy() : me.api.asc_Paste());
Common.NotificationCenter.trigger('edit:complete', me.documentHolder);
}
} else
Common.component.Analytics.trackEvent('ToolBar', 'Copy Warning');
}
}
Common.NotificationCenter.trigger('edit:complete', me.documentHolder);
},
onInsertEntire: function(item) {
......
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file @ 9297531d
......@@ -327,29 +327,21 @@ define([
onCopyPaste: function(copy, e) {
var me = this;
if (me.api) {
if (typeof window['AscDesktopEditor'] === 'object') {
copy ? me.api.asc_Copy() : me.api.asc_Paste();
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
} else {
var res = (copy) ? me.api.asc_Copy() : me.api.asc_Paste();
if (!res) {
var value = Common.localStorage.getItem("sse-hide-copywarning");
if (!(value && parseInt(value) == 1)) {
(new Common.Views.CopyWarningDialog({
handler: function(dontshow) {
copy ? me.api.asc_Copy() : me.api.asc_Paste();
if (dontshow) Common.localStorage.setItem("sse-hide-copywarning", 1);
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
})).show();
} else {
copy ? me.api.asc_Copy() : me.api.asc_Paste();
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
}
Common.component.Analytics.trackEvent('ToolBar', 'Copy Warning');
} else {
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
} else
Common.component.Analytics.trackEvent('ToolBar', 'Copy Warning');
}
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
},
onIncreaseFontSize: function(e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7