From 9ebae2ae295f745e1c3f257a52551b65e791f852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 24 Nov 2011 00:16:01 +0200 Subject: fix jQuery capitalization --- lib/scripts/compatibility.js | 2 +- lib/scripts/page.js | 2 +- lib/scripts/qsearch.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/scripts') diff --git a/lib/scripts/compatibility.js b/lib/scripts/compatibility.js index ea52153c5..385e45854 100644 --- a/lib/scripts/compatibility.js +++ b/lib/scripts/compatibility.js @@ -49,7 +49,7 @@ function DEPRECATED_WRAP(func, context) { * @link http://prototype.conio.net/ */ function $() { - DEPRECATED('Please use the JQuery() function instead.'); + DEPRECATED('Please use the jQuery() function instead.'); var elements = new Array(); diff --git a/lib/scripts/page.js b/lib/scripts/page.js index e4033b76d..55a844f0b 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -43,7 +43,7 @@ dw_page = { * * @param target - the DOM element at which the popup should be aligned at * @param popup_id - the ID of the (new) DOM popup - * @return the Popup JQuery object + * @return the Popup jQuery object */ insituPopup: function(target, popup_id) { // get or create the popup div diff --git a/lib/scripts/qsearch.js b/lib/scripts/qsearch.js index c7128b9e3..a309f9e29 100644 --- a/lib/scripts/qsearch.js +++ b/lib/scripts/qsearch.js @@ -18,8 +18,8 @@ var dw_qsearch = { * * Attaches the event handlers * - * @param input element (JQuery selector/DOM obj) - * @param output element (JQuery selector/DOM obj) + * @param input element (jQuery selector/DOM obj) + * @param output element (jQuery selector/DOM obj) */ init: function (input, output) { var do_qsearch; -- cgit v1.2.3 From 8d739053e2e2092fa7136a1709c730407f770143 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 16:32:35 +0100 Subject: fix IE8 error FS#2381 A trailing comma created an empty array item causing IE8 to choke. --- lib/scripts/editor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/scripts') diff --git a/lib/scripts/editor.js b/lib/scripts/editor.js index 2009ce6af..f36d446d5 100644 --- a/lib/scripts/editor.js +++ b/lib/scripts/editor.js @@ -61,9 +61,9 @@ var dw_editor = { jQuery.each([ ['larger', function(){dw_editor.sizeCtl(editor,100);}], ['smaller', function(){dw_editor.sizeCtl(editor,-100);}], - ['wrap', function(){dw_editor.toggleWrap(editor);}], + ['wrap', function(){dw_editor.toggleWrap(editor);}] ], function (_, img) { - jQuery(document.createElement('img')) + jQuery(document.createElement('IMG')) .attr('src', DOKU_BASE+'lib/images/' + img[0] + '.gif') .click(img[1]) .appendTo($ctl); -- cgit v1.2.3 From 29a277ba918a65400b1beb961d142772efc26897 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 16:42:29 +0100 Subject: IE doesn't know indexOf for arrays FS#2381 this fixes another IE javascript problem in edit mode --- lib/scripts/editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/scripts') diff --git a/lib/scripts/editor.js b/lib/scripts/editor.js index f36d446d5..042e34608 100644 --- a/lib/scripts/editor.js +++ b/lib/scripts/editor.js @@ -130,7 +130,7 @@ var dw_editor = { * @param event e - the key press event object */ keyHandler: function(e){ - if([8, 13, 32].indexOf(e.keyCode) === -1) { + if(jQuery.inArray(e.keyCode,[8, 13, 32]) === -1) { return; } var selection = getSelection(this); -- cgit v1.2.3 From 2e9c51889d8855cf56cb3f21a9c4926bd94ef21f Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 16:52:41 +0100 Subject: IE8: fix namespace selection in link wizard FS#2391 IE8 can't substr() with negative offsets. --- lib/scripts/linkwiz.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/scripts') diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index cc4c19e0d..ce072d4b2 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -186,7 +186,7 @@ var dw_linkwiz = { */ resultClick: function(a){ dw_linkwiz.$entry.val(a.title); - if(a.title == '' || a.title.substr(-1) == ':'){ + if(a.title == '' || a.title.substr(a.title.length-1) == ':'){ dw_linkwiz.autocomplete_exec(); }else{ if (jQuery(a.nextSibling).is('span')) { -- cgit v1.2.3 From c798b23bcedefa974e4af474904e4e24cdad67d5 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 17:33:52 +0100 Subject: rely on jQuery UI's dialog methods for toggling the linkwizard FS#2394 --- lib/scripts/linkwiz.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib/scripts') diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index ce072d4b2..dcfafd75e 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -35,13 +35,12 @@ var dw_linkwiz = { ) .parent() .attr('id','link__wiz') - .addClass('a11y') .css({ 'position': 'absolute', 'top': (pos.top+20)+'px', 'left': (pos.left+80)+'px' }) - .show() + .hide() .appendTo('div.dokuwiki'); dw_linkwiz.textArea = $editor[0]; @@ -283,7 +282,7 @@ var dw_linkwiz = { */ show: function(){ dw_linkwiz.selection = getSelection(dw_linkwiz.textArea); - dw_linkwiz.$wiz.removeClass('a11y'); + dw_linkwiz.$wiz.show(); dw_linkwiz.$entry.focus(); dw_linkwiz.autocomplete(); }, @@ -292,7 +291,7 @@ var dw_linkwiz = { * Hide the link wizard */ hide: function(){ - dw_linkwiz.$wiz.addClass('a11y'); + dw_linkwiz.$wiz.hide(); dw_linkwiz.textArea.focus(); }, @@ -300,7 +299,7 @@ var dw_linkwiz = { * Toggle the link wizard */ toggle: function(){ - if(dw_linkwiz.$wiz.hasClass('a11y')){ + if(dw_linkwiz.$wiz.css('display') == 'none'){ dw_linkwiz.show(); }else{ dw_linkwiz.hide(); -- cgit v1.2.3 From 4feb08e1dd7fd1c0a09310ca29a7cbac2559edb9 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 28 Nov 2011 19:53:35 +0100 Subject: only strip special chars when suggesting an upload name FS#2377 The uploader now just strips a bunch of common special chars. This is not a complete cleanID() implementation. A full clean is done server-side on uploading. --- lib/scripts/fileuploaderextended.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/scripts') diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js index f92bdbc49..4abd63bef 100644 --- a/lib/scripts/fileuploaderextended.js +++ b/lib/scripts/fileuploaderextended.js @@ -55,9 +55,11 @@ qq.extend(qq.FileUploader.prototype, { qq.setText(fileElement, fileName); this._find(item, 'size').style.display = 'none'; + // name suggestion (simplified cleanID) var nameElement = this._find(item, 'nameInput'); fileName = fileName.toLowerCase(); - fileName = fileName.replace(/([^a-z0-9_\.\-]+)/g, '_'); + fileName = fileName.replace(/([ !"#$%&\'()+,\/;<=>?@[\]^`{|}~:]+)/g, '_'); + fileName = fileName.replace(/^_+/,''); nameElement.value = fileName; nameElement.id = 'mediamanager__upload_item'+id; -- cgit v1.2.3 From 04dd9c85e28535b43c7821841cd97b52682adae3 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 28 Nov 2011 22:14:20 +0000 Subject: fixed link wizard being appended to every div.dokuwiki (FS#2395) and changed div.dokuwiki to just .dokuwiki (some templates have the class in the body) --- lib/scripts/linkwiz.js | 2 +- lib/scripts/page.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/scripts') diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index dcfafd75e..5075a0ab8 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -41,7 +41,7 @@ var dw_linkwiz = { 'left': (pos.left+80)+'px' }) .hide() - .appendTo('div.dokuwiki'); + .appendTo('.dokuwiki:first'); dw_linkwiz.textArea = $editor[0]; dw_linkwiz.result = jQuery('#link__wiz_result')[0]; diff --git a/lib/scripts/page.js b/lib/scripts/page.js index 55a844f0b..5da4a9cc0 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -55,7 +55,7 @@ dw_page = { .attr('id', popup_id) .addClass('insitu-footnote JSpopup') .mouseleave(function () {jQuery(this).hide();}); - jQuery('div.dokuwiki:first').append($fndiv); + jQuery('.dokuwiki:first').append($fndiv); } // position() does not support hidden elements -- cgit v1.2.3 From 4b7f30c244499fdfe9457b8d7a76566bee7d3abf Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Wed, 30 Nov 2011 00:37:52 +0000 Subject: bind JS for revision diff also when called through AJAX (fixes checkbox selection in history of new media manager, FS#2398) --- lib/scripts/behaviour.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/scripts') diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js index 20b408322..cffdde042 100644 --- a/lib/scripts/behaviour.js +++ b/lib/scripts/behaviour.js @@ -16,7 +16,7 @@ var dw_behaviour = { dw_behaviour.subscription(); dw_behaviour.revisionBoxHandler(); - jQuery('#page__revisions input[type=checkbox]').click( + jQuery('#page__revisions input[type=checkbox]').live('click', dw_behaviour.revisionBoxHandler ); }, -- cgit v1.2.3 From b1ab5da7c783154a7ce22f4b34beb10b79f8768d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 4 Dec 2011 17:32:25 +0000 Subject: fixed list type being sometimes undefined --- lib/scripts/media.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/scripts') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 7f5514f56..267e64a76 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -371,6 +371,10 @@ var dw_mediamanager = { if (typeof new_val === 'undefined') { new_val = jQuery('form.options li.' + opt[1] + ' input') .filter(':checked').val(); + // if new_val is still undefined (because form.options is not in active tab), set to most spacious option + if (typeof new_val === 'undefined') { + new_val = 'thumbs'; + } } if (new_val !== dw_mediamanager.view_opts[opt[0]]) { -- cgit v1.2.3 From eb2f7e5e56a00f69a13722cc4297a6d6a61bd00f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 27 Dec 2011 11:26:02 +0000 Subject: fixed no align option in media settings modal window (FS#2411) --- lib/scripts/media.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/scripts') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 267e64a76..c74633523 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -253,8 +253,10 @@ var dw_mediamanager = { } } } - alignleft = dw_mediamanager.align === '2' ? '' : ' '; - alignright = dw_mediamanager.align === '4' ? '' : ' '; + if (dw_mediamanager.align !== '1') { + alignleft = dw_mediamanager.align === '2' ? '' : ' '; + alignright = dw_mediamanager.align === '4' ? '' : ' '; + } } } edid = String.prototype.match.call(document.location, /&edid=([^&]+)/); -- cgit v1.2.3 From 2dba8df4d3a5c3e9d104bee5290766929f4cabee Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 13 Jan 2012 10:02:32 +0100 Subject: Fix sorting in media manager search (FS#2423) --- lib/scripts/media.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/scripts') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index c74633523..841baa93f 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -135,7 +135,7 @@ var dw_mediamanager = { }); $sortBy.children('input').change(function (event) { dw_mediamanager.set_fileview_sort(); - dw_mediamanager.list.call(this, event); + dw_mediamanager.list.call(jQuery('#dw__mediasearch')[0] || this, event); }); }, -- cgit v1.2.3