From f6f771ca288974ca7d259cf35f0d416fef44ef6e Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sat, 9 Jul 2011 21:04:18 +0300
Subject: [PATCH] media.js fix
---
lib/scripts/media.js | 102 +++++++++++++++++++++----------------------
1 file changed, 51 insertions(+), 51 deletions(-)
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 4eb1e7b63..8c68fa569 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -321,8 +321,8 @@
* @author Pierre Spring <pierre.spring@caillou.ch>
*/
list = function (event) {
- var link, content, params;
- link = $(this);
+ var $link, $content, params;
+ $link = jQuery(this);
event.preventDefault();
@@ -330,31 +330,31 @@
if (document.getElementById('media__content')) {
//popup
- content = $('#media__content');
- content.html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
+ $content = jQuery('#media__content');
+ $content.html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
} else {
//fullscreen media manager
- content = $('#mediamanager__layout_list');
+ $content = jQuery('#mediamanager__layout_list');
- if (link.hasClass('idx_dir')) {
+ if ($link.hasClass('idx_dir')) {
//changing namespace
- $('#mediamanager__layout_detail').empty();
+ jQuery('#mediamanager__layout_detail').empty();
}
- $('.scroll-container', content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
+ jQuery('.scroll-container', $content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
}
params = '';
- if (link[0].search) {
- params = link[0].search.substr(1)+'&call=medialist';
- } else if (link[0].action) {
- params = form_params(link)+'&call=medialist';
+ if ($link[0].search) {
+ params = $link[0].search.substr(1)+'&call=medialist';
+ } else if ($link[0].action) {
+ params = form_params($link)+'&call=medialist';
}
// fetch the subtree
- update_content(content, params);
+ update_content($content, params);
};
@@ -363,11 +363,11 @@
*
* @author Kate Arzamastseva <pshns@ukr.net>
*/
- form_params = function (form) {
- var elements = form.serialize();
+ form_params = function ($form) {
+ var elements = $form.serialize();
var action = '';
- var i = form[0].action.indexOf('?');
- if (i >= 0) action = form[0].action.substr(i+1);
+ var i = $form[0].action.indexOf('?');
+ if (i >= 0) action = $form[0].action.substr(i+1);
return elements+'&'+action;
};
@@ -377,18 +377,18 @@
* @author Kate Arzamastseva <pshns@ukr.net>
*/
list_view = function (event) {
- var link, content;
- link = $(this);
+ var $link, $content;
+ $link = jQuery(this);
event.preventDefault();
- content = $('#mediamanager__file_list');
- if (link.hasClass('mediamanager-link-thumbnails')) {
- content.removeClass('mediamanager-list');
- content.addClass('mediamanager-thumbs');
- } else if (link.hasClass('mediamanager-link-list')) {
- content.removeClass('mediamanager-thumbs');
- content.addClass('mediamanager-list');
+ $content = jQuery('#mediamanager__file_list');
+ if ($link.hasClass('mediamanager-link-thumbnails')) {
+ $content.removeClass('mediamanager-list');
+ $content.addClass('mediamanager-thumbs');
+ } else if ($link.hasClass('mediamanager-link-list')) {
+ $content.removeClass('mediamanager-thumbs');
+ $content.addClass('mediamanager-list');
}
};
@@ -398,43 +398,43 @@
* @author Kate Arzamastseva <pshns@ukr.net>
*/
details = function (event) {
- var link, content, params, update_list;
- link = $(this);
+ var $link, $content, params, update_list;
+ $link = jQuery(this);
event.preventDefault();
jQuery('div.success, div.info, div.error, div.notify').remove();
- if (link[0].id == 'mediamanager__btn_delete' && !confirm(LANG['del_confirm'])) return false;
- if (link[0].id == 'mediamanager__btn_restore' && !confirm(LANG['restore_confirm'])) return false;
+ if ($link[0].id == 'mediamanager__btn_delete' && !confirm(LANG['del_confirm'])) return false;
+ if ($link[0].id == 'mediamanager__btn_restore' && !confirm(LANG['restore_confirm'])) return false;
- content = $('#mediamanager__layout_detail');
- $('.scroll-container', content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
+ $content = $('#mediamanager__layout_detail');
+ jQuery('.scroll-container', $content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
params = '';
- if (link[0].search) {
- params = link[0].search.substr(1)+'&call=mediadetails';
+ if ($link[0].search) {
+ params = $link[0].search.substr(1)+'&call=mediadetails';
} else {
- params = form_params(link)+'&call=mediadetails';
+ params = form_params($link)+'&call=mediadetails';
}
- update_content(content, params);
+ update_content($content, params);
- update_list = (link[0].id == 'mediamanager__btn_delete' || link[0].id == 'mediamanager__btn_restore');
+ update_list = ($link[0].id == 'mediamanager__btn_delete' || $link[0].id == 'mediamanager__btn_restore');
if (update_list) {
- var link1, content1, params1;
- link1 = $('a.files');
- params1 = link1[0].search.substr(1)+'&call=medialist';
- content1 = $('#mediamanager__layout_list');
- $('.scroll-container', content1).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
+ var $link1, $content1, params1;
+ $link1 = jQuery('a.files');
+ params1 = $link1[0].search.substr(1)+'&call=medialist';
+ $content1 = jQuery('#mediamanager__layout_list');
+ jQuery('.scroll-container', $content1).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />');
- update_content(content1, params1);
+ update_content($content1, params1);
}
};
- update_content = function (content, params) {
- $.post(
+ update_content = function ($content, params) {
+ jQuery.post(
DOKU_BASE + 'lib/exe/ajax.php',
params,
function (data) {
@@ -831,29 +831,29 @@
};
$(function () {
- var content = $('#media__content');
- prepare_content(content);
+ var $content = jQuery('#media__content');
+ prepare_content($content);
attachoptions();
initpopup();
// add the action to autofill the "upload as" field
- content.delegate('#upload__file', 'change', suggest)
+ $content.delegate('#upload__file', 'change', suggest)
// Attach the image selector action to all links
.delegate('a.select', 'click', select)
// Attach deletion confirmation dialog to the delete buttons
.delegate('#media__content a.btn_media_delete', 'click', confirmattach);
- $('#media__tree').delegate('img', 'click', toggle)
+ jQuery('#media__tree').delegate('img', 'click', toggle)
.delegate('a', 'click', list);
- $('#mediamanager__layout_list').delegate('#mediamanager__tabs_files a', 'click', list)
+ jQuery('#mediamanager__layout_list').delegate('#mediamanager__tabs_files a', 'click', list)
.delegate('#mediamanager__tabs_list a', 'click', list_view)
.delegate('#mediamanager__file_list a', 'click', details)
.delegate('#dw__mediasearch', 'submit', list);
- $('#mediamanager__layout_detail').delegate('#mediamanager__tabs_details a', 'click', details)
+ jQuery('#mediamanager__layout_detail').delegate('#mediamanager__tabs_details a', 'click', details)
.delegate('#mediamanager__btn_update', 'submit', list)
.delegate('#page__revisions', 'submit', details)
.delegate('#page__revisions a', 'click', details)
--
GitLab