summaryrefslogtreecommitdiff
path: root/program/js/tiny_mce/plugins/tabfocus/editor_plugin_src.js
diff options
context:
space:
mode:
Diffstat (limited to 'program/js/tiny_mce/plugins/tabfocus/editor_plugin_src.js')
-rw-r--r--program/js/tiny_mce/plugins/tabfocus/editor_plugin_src.js58
1 files changed, 30 insertions, 28 deletions
diff --git a/program/js/tiny_mce/plugins/tabfocus/editor_plugin_src.js b/program/js/tiny_mce/plugins/tabfocus/editor_plugin_src.js
index c2be2f40a..f4545e167 100644
--- a/program/js/tiny_mce/plugins/tabfocus/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/tabfocus/editor_plugin_src.js
@@ -22,27 +22,30 @@
var x, i, f, el, v;
function find(d) {
- f = DOM.getParent(ed.id, 'form');
- el = f.elements;
-
- if (f) {
- each(el, function(e, i) {
- if (e.id == ed.id) {
- x = i;
- return false;
- }
- });
-
- if (d > 0) {
- for (i = x + 1; i < el.length; i++) {
- if (el[i].type != 'hidden')
- return el[i];
- }
- } else {
- for (i = x - 1; i >= 0; i--) {
- if (el[i].type != 'hidden')
- return el[i];
- }
+ el = DOM.select(':input:enabled,*[tabindex]');
+ function canSelect(e) {
+ return e.type != 'hidden' &&
+ e.tabIndex != '-1' &&
+ !(el[i].style.display == "none") &&
+ !(el[i].style.visibility == "hidden");
+ }
+
+ each(el, function(e, i) {
+ if (e.id == ed.id) {
+ x = i;
+ return false;
+ }
+ });
+
+ if (d > 0) {
+ for (i = x + 1; i < el.length; i++) {
+ if (canSelect(el[i]))
+ return el[i];
+ }
+ } else {
+ for (i = x - 1; i >= 0; i--) {
+ if (canSelect(el[i]))
+ return el[i];
}
}
@@ -71,10 +74,14 @@
}
if (el) {
- if (ed = tinymce.get(el.id || el.name))
+ if (el.id && (ed = tinymce.get(el.id || el.name)))
ed.focus();
else
- window.setTimeout(function() {window.focus();el.focus();}, 10);
+ window.setTimeout(function() {
+ if (!tinymce.isWebKit)
+ window.focus();
+ el.focus();
+ }, 10);
return Event.cancel(e);
}
@@ -89,11 +96,6 @@
} else
ed.onKeyDown.add(tabHandler);
- ed.onInit.add(function() {
- each(DOM.select('a:first,a:last', ed.getContainer()), function(n) {
- Event.add(n, 'focus', function() {ed.focus();});
- });
- });
},
getInfo : function() {