- TinyMCE 3.4.1

2 files changed, 31 insertions, 29 deletions

diff --git a/program/js/tiny_mce/plugins/tabfocus/editor_plugin.js b/program/js/tiny_mce/plugins/tabfocus/editor_plugin.js
index 27d244022..d18689ddb 100644
--- a/program/js/tiny_mce/plugins/tabfocus/editor_plugin.js
+++ b/program/js/tiny_mce/plugins/tabfocus/editor_plugin.js
@@ -1 +1 @@
-(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(i){o=c.getParent(l.id,"form");n=o.elements;if(o){d(n,function(s,r){if(s.id==l.id){j=r;return false}});if(i>0){for(m=j+1;m<n.length;m++){if(n[m].type!="hidden"){return n[m]}}}else{for(m=j-1;m>=0;m--){if(n[m].type!="hidden"){return n[m]}}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(l=tinymce.get(n.id||n.name)){l.focus()}else{window.setTimeout(function(){window.focus();n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}f.onInit.add(function(){d(c.select("a:first,a:last",f.getContainer()),function(i){a.add(i,"focus",function(){f.focus()})})})},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(r){n=c.select(":input:enabled,*[tabindex]");function i(s){return s.type!="hidden"&&s.tabIndex!="-1"&&!(n[m].style.display=="none")&&!(n[m].style.visibility=="hidden")}d(n,function(t,s){if(t.id==l.id){j=s;return false}});if(r>0){for(m=j+1;m<n.length;m++){if(i(n[m])){return n[m]}}}else{for(m=j-1;m>=0;m--){if(i(n[m])){return n[m]}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(n.id&&(l=tinymce.get(n.id||n.name))){l.focus()}else{window.setTimeout(function(){if(!tinymce.isWebKit){window.focus()}n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
\ No newline at end of file
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() {