diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index f17b84b9b9..cc033b3ba6 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -1036,6 +1036,8 @@ DE.ApplicationController = new(function(){ $('#editor_sdk').on('click', function(e) { if ( e.target.localName == 'canvas' ) { + if (e.target.getAttribute && e.target.getAttribute("oo_no_focused")) + return; e.currentTarget.focus(); } }); diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index a3ff577f92..d0c8e0c587 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -114,8 +114,11 @@ define([ if (e.target.localName == 'canvas') { if (me._preventClick) me._preventClick = false; - else + else { + if (e.target.getAttribute && e.target.getAttribute("oo_no_focused")) + return; me.boxSdk.focus(); + } } }); this.boxSdk.on('mousedown', function(e){ diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js index 2b03599cea..cf011b2e32 100644 --- a/apps/documenteditor/main/app/controller/DocumentHolder.js +++ b/apps/documenteditor/main/app/controller/DocumentHolder.js @@ -438,8 +438,11 @@ define([ if (e.target.localName == 'canvas') { if (me._preventClick) me._preventClick = false; - else + else { + if (e.target.getAttribute && e.target.getAttribute("oo_no_focused")) + return; meEl.focus(); + } } }); meEl.on('mousedown', function(e){ diff --git a/apps/pdfeditor/main/app/controller/DocumentHolder.js b/apps/pdfeditor/main/app/controller/DocumentHolder.js index eb6ae98035..a4d964f98e 100644 --- a/apps/pdfeditor/main/app/controller/DocumentHolder.js +++ b/apps/pdfeditor/main/app/controller/DocumentHolder.js @@ -382,8 +382,11 @@ define([ if (e.target.localName == 'canvas') { if (me._preventClick) me._preventClick = false; - else + else { + if (e.target.getAttribute && e.target.getAttribute("oo_no_focused")) + return; meEl.focus(); + } } }); meEl.on('mousedown', function(e){ diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index f9d161d731..fd705acc16 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -521,6 +521,8 @@ PE.ApplicationController = new(function(){ $('#editor_sdk').on('click', function(e) { if ( e.target.localName == 'canvas' ) { + if (e.target.getAttribute && e.target.getAttribute("oo_no_focused")) + return; e.currentTarget.focus(); } }); diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js index d3aa2bd614..76b419e2d1 100644 --- a/apps/presentationeditor/main/app/controller/DocumentHolder.js +++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js @@ -242,8 +242,11 @@ define([ if (e.target.localName == 'canvas') { if (me._preventClick) me._preventClick = false; - else + else { + if (e.target.getAttribute && e.target.getAttribute("oo_no_focused")) + return; meEl.focus(); + } } }); meEl.on('mousedown', function(e){ diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index bfc5e5972f..06f57b6316 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -553,6 +553,8 @@ SSE.ApplicationController = new(function(){ $('#editor_sdk').on('click', function(e) { if ( e.target.localName == 'canvas' ) { + if (e.target.getAttribute && e.target.getAttribute("oo_no_focused")) + return; e.currentTarget.focus(); } }); diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolderExt.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolderExt.js index a496a6a295..3caf85f261 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolderExt.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolderExt.js @@ -226,8 +226,11 @@ define([], function () { if (e.target.localName == 'canvas' && (!me.isEditFormula || me.rangeSelectionMode)) { if (me._preventClick) me._preventClick = false; - else + else { + if (e.target.getAttribute && e.target.getAttribute("oo_no_focused")) + return; documentHolderEl.focus(); + } } } }, diff --git a/apps/visioeditor/embed/js/ApplicationController.js b/apps/visioeditor/embed/js/ApplicationController.js index 0cf6128a55..99b5c159ee 100644 --- a/apps/visioeditor/embed/js/ApplicationController.js +++ b/apps/visioeditor/embed/js/ApplicationController.js @@ -590,6 +590,8 @@ VE.ApplicationController = new(function(){ $('#editor_sdk').on('click', function(e) { if ( e.target.localName == 'canvas' ) { + if (e.target.getAttribute && e.target.getAttribute("oo_no_focused")) + return; e.currentTarget.focus(); } }); diff --git a/apps/visioeditor/main/app/controller/DocumentHolder.js b/apps/visioeditor/main/app/controller/DocumentHolder.js index 2bdc2f678e..bb3f4ea8f0 100644 --- a/apps/visioeditor/main/app/controller/DocumentHolder.js +++ b/apps/visioeditor/main/app/controller/DocumentHolder.js @@ -344,8 +344,11 @@ define([ if (e.target.localName == 'canvas') { if (me._preventClick) me._preventClick = false; - else + else { + if (e.target.getAttribute && e.target.getAttribute("oo_no_focused")) + return; meEl.focus(); + } } }); meEl.on('mousedown', function(e){