http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100338
Revision: 100338
Author: fptc
Date: 2011-10-20 12:08:16 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
FreqPatternTagCloud: Bugfix jQuery and compatibility issues with
UsabilityInitiative extension
Modified Paths:
--------------
trunk/extensions/FreqPatternTagCloud/FreqPatternTagCloud.body.php
trunk/extensions/FreqPatternTagCloud/FreqPatternTagCloud.php
trunk/extensions/FreqPatternTagCloud/includes/computation/FrequentPatternApriori.php
trunk/extensions/FreqPatternTagCloud/javascripts/jquery-ui-1.8.custom.min.js
trunk/extensions/FreqPatternTagCloud/javascripts/jquery.contextMenu.js
trunk/extensions/FreqPatternTagCloud/javascripts/main.js
trunk/extensions/FreqPatternTagCloud/javascripts/search.js
trunk/extensions/FreqPatternTagCloud/stylesheets/main.css
Modified: trunk/extensions/FreqPatternTagCloud/FreqPatternTagCloud.body.php
===================================================================
--- trunk/extensions/FreqPatternTagCloud/FreqPatternTagCloud.body.php
2011-10-20 11:02:33 UTC (rev 100337)
+++ trunk/extensions/FreqPatternTagCloud/FreqPatternTagCloud.body.php
2011-10-20 12:08:16 UTC (rev 100338)
@@ -130,7 +130,6 @@
$dbr = wfGetDB( DB_SLAVE );
// Get possible attribute values
- // @todo FIXME: ugly + SQL INJECTION POINT!
$res = $dbr->query(
"(SELECT DISTINCT vals.smw_title AS val, atts.smw_title
AS att
FROM ".$dbr->tableName("smw_ids")." vals,
".$dbr->tableName("smw_ids")." atts, ".$dbr->tableName("smw_rels2")." rels
@@ -140,10 +139,10 @@
AND atts.smw_namespace = 102
AND LENGTH(vals.smw_iw) = 0
AND LENGTH(atts.smw_iw) = 0
- AND vals.smw_title LIKE
'%".mysql_real_escape_string($currentSearchValue)."%'
- ORDER BY vals.smw_title
- LIMIT 20) UNION (
- SELECT smw_title AS val,
'".wfMsg("fptc-categoryname")."' AS att
+ AND vals.smw_title LIKE
'%".mysql_real_escape_string($currentSearchValue)."%'
+ ORDER BY vals.smw_title
+ LIMIT 20) UNION (
+ SELECT smw_title AS val,
'".mysql_real_escape_string(wfMsg("fptc-categoryname"))."' AS att
FROM ".$dbr->tableName("smw_ids")."
WHERE smw_title LIKE
'%".mysql_real_escape_string($currentSearchValue)."%'
AND smw_namespace = 14
@@ -252,7 +251,7 @@
<li class="browse">
<a href="#browse">' . wfMsg(
'fptc-context-menu-browse' ) . '</a>
</li>
- <li class="suggestions separator">
+ <li class="fptc_suggestions separator">
' . wfMsg(
'fptc-context-menu-similar-tags' ) . '
</li>
</ul>'
Modified: trunk/extensions/FreqPatternTagCloud/FreqPatternTagCloud.php
===================================================================
--- trunk/extensions/FreqPatternTagCloud/FreqPatternTagCloud.php
2011-10-20 11:02:33 UTC (rev 100337)
+++ trunk/extensions/FreqPatternTagCloud/FreqPatternTagCloud.php
2011-10-20 12:08:16 UTC (rev 100338)
@@ -70,7 +70,8 @@
// @todo FIXME: this should use ResourceLoader and the appropriate core
// functions instead of using its own jQuery etc.
$wgOut->addExtensionStyle(
$wgScriptPath.'/extensions/FreqPatternTagCloud/stylesheets/jquery/ui-lightness/jquery-ui-1.8.custom.css'
);
- $wgOut->addScriptFile( $wgScriptPath .
'/extensions/FreqPatternTagCloud/javascripts/jquery-1.4.2.min.js' );
+ #$wgOut->addScriptFile( $wgScriptPath .
'/extensions/FreqPatternTagCloud/javascripts/jquery-1.4.2.min.js' );
+ $wgOut->addScriptFile( $wgScriptPath .
'/extensions/FreqPatternTagCloud/javascripts/jquery.parseJSON.js' );
$wgOut->addScriptFile( $wgScriptPath .
'/extensions/FreqPatternTagCloud/javascripts/jquery-ui-1.8.custom.min.js' );
if ( $wgFreqPatternTagCloudSearchBarModification ) {
Modified:
trunk/extensions/FreqPatternTagCloud/includes/computation/FrequentPatternApriori.php
===================================================================
---
trunk/extensions/FreqPatternTagCloud/includes/computation/FrequentPatternApriori.php
2011-10-20 11:02:33 UTC (rev 100337)
+++
trunk/extensions/FreqPatternTagCloud/includes/computation/FrequentPatternApriori.php
2011-10-20 12:08:16 UTC (rev 100338)
@@ -17,6 +17,10 @@
$numTransactions = count($transactions);
$allFrequentItemsets = array();
+ if ($numTransactions == 0) {
+ return array();
+ }
+ else {
// Get all 1-frequent itemsets
foreach ($items as $item) {
$freq = 0;
@@ -65,6 +69,7 @@
}
return $allFrequentItemsets;
+ }
}
Modified:
trunk/extensions/FreqPatternTagCloud/javascripts/jquery-ui-1.8.custom.min.js
===================================================================
---
trunk/extensions/FreqPatternTagCloud/javascripts/jquery-ui-1.8.custom.min.js
2011-10-20 11:02:33 UTC (rev 100337)
+++
trunk/extensions/FreqPatternTagCloud/javascripts/jquery-ui-1.8.custom.min.js
2011-10-20 12:08:16 UTC (rev 100338)
@@ -1,4 +1,4 @@
-/*!
+ /*!
* jQuery UI 1.8
*
* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
@@ -401,4 +401,4 @@
* Depends:
* jquery.effects.core.js
*/
-(function(a){a.effects.transfer=function(b){return this.queue(function(){var
f=a(this),h=a(b.options.to),e=h.offset(),g={top:e.top,left:e.left,height:h.innerHeight(),width:h.innerWidth()},d=f.offset(),c=a('<div
class="ui-effects-transfer"></div>').appendTo(document.body).addClass(b.options.className).css({top:d.top,left:d.left,height:f.innerHeight(),width:f.innerWidth(),position:"absolute"}).animate(g,b.duration,b.options.easing,function(){c.remove();(b.callback&&b.callback.apply(f[0],arguments));f.dequeue()})})}})(jQuery);;
\ No newline at end of file
+(function(a){a.effects.transfer=function(b){return this.queue(function(){var
f=a(this),h=a(b.options.to),e=h.offset(),g={top:e.top,left:e.left,height:h.innerHeight(),width:h.innerWidth()},d=f.offset(),c=a('<div
class="ui-effects-transfer"></div>').appendTo(document.body).addClass(b.options.className).css({top:d.top,left:d.left,height:f.innerHeight(),width:f.innerWidth(),position:"absolute"}).animate(g,b.duration,b.options.easing,function(){c.remove();(b.callback&&b.callback.apply(f[0],arguments));f.dequeue()})})}})(jQuery);;
Modified: trunk/extensions/FreqPatternTagCloud/javascripts/jquery.contextMenu.js
===================================================================
--- trunk/extensions/FreqPatternTagCloud/javascripts/jquery.contextMenu.js
2011-10-20 11:02:33 UTC (rev 100337)
+++ trunk/extensions/FreqPatternTagCloud/javascripts/jquery.contextMenu.js
2011-10-20 12:08:16 UTC (rev 100338)
@@ -1,3 +1,5 @@
+jQuery( document ).ready( function( $ ) {
+
// jQuery Context Menu Plugin
//
// Version 1.01
@@ -212,4 +214,6 @@
}
});
-})(jQuery);
\ No newline at end of file
+})(jQuery);
+
+});
Modified: trunk/extensions/FreqPatternTagCloud/javascripts/main.js
===================================================================
--- trunk/extensions/FreqPatternTagCloud/javascripts/main.js 2011-10-20
11:02:33 UTC (rev 100337)
+++ trunk/extensions/FreqPatternTagCloud/javascripts/main.js 2011-10-20
12:08:16 UTC (rev 100338)
@@ -16,31 +16,32 @@
// Relocate
var pageName = RegExp.$1;
- window.location = window.location.href.replace(new RegExp(pageName +
".*"), pageName + "/" + $("#fptc_attributeName").val());
+ window.location = window.location.href.replace(new RegExp(pageName +
".*"), pageName + "/" + $j("#fptc_attributeName").val());
};
-$().ready(function() {
+
+$j().ready(function() {
// Process form when key "return" is pressed
- $("#fptc_attributeName").keypress(function(e) {
+ $j("#fptc_attributeName").keypress(function(e) {
if(e.which == 13){
fptc_relocate();
}
});
- var attribute = $("#fptc_attributeName").val();
+ var attribute = $j("#fptc_attributeName").val();
// Context menu for tag cloud
- $(".fptc_tag a").contextMenu({
+ $j(".fptc_tag a").contextMenu({
menu: "fptc_contextMenu",
onOpen: function(el) {
// Indicate loading
- $("#fptc_contextMenu li").slice(2).remove();
- $("#fptc_contextMenu").append('<li class="loading"></li>');
+ $j("#fptc_contextMenu li").slice(2).remove();
+ $j("#fptc_contextMenu").append('<li class="loading"></li>');
// Replace contents when done with loading
sajax_do_call("FreqPatternTagCloud::getSuggestions", [attribute,
el.text()], function(data) {
// Process return data
- $("#fptc_contextMenu .loading").replaceWith(data.responseText);
+ $j("#fptc_contextMenu
.loading").replaceWith(data.responseText);
});
}
}, function(action, el, pos, menu) {
@@ -52,7 +53,7 @@
});
// Autosuggestion for input field
- $("#fptc_attributeName").autocomplete({
+ $j("#fptc_attributeName").autocomplete({
delay: 0,
source: function(currentValue, callbackForResults) {
sajax_do_call("FreqPatternTagCloud::getAttributeSuggestions",
[currentValue.term], function(data) {
Modified: trunk/extensions/FreqPatternTagCloud/javascripts/search.js
===================================================================
--- trunk/extensions/FreqPatternTagCloud/javascripts/search.js 2011-10-20
11:02:33 UTC (rev 100337)
+++ trunk/extensions/FreqPatternTagCloud/javascripts/search.js 2011-10-20
12:08:16 UTC (rev 100338)
@@ -7,12 +7,12 @@
* @version 1.0
*/
- $().ready(function() {
+ $j().ready(function() {
// Autosuggestion for search input field using frequent pattern techniques
- $.widget( "custom.autocomplete_search", $.ui.autocomplete, {
+ $j.widget( "custom.autocomplete_search", $j.ui.autocomplete, {
_renderMenu: function( ul, items ) {
var self = this, currentCategory = "";
- $.each( items, function( index, item ) {
+ $j.each( items, function( index, item ) {
if ( item.category != currentCategory ) {
// Value changed
ul.append('<li
class="fptc_search_category">' + item.category + "</li>" );
@@ -22,7 +22,7 @@
});
}
});
- $("#searchInput, #searchText").autocomplete_search({
+ $j("#searchInput, #searchText").autocomplete_search({
delay: 0,
source: function(currentValue, callbackForResults) {
sajax_do_call("FreqPatternTagCloud::getSearchSuggestions",
[currentValue.term], function(data) {
Modified: trunk/extensions/FreqPatternTagCloud/stylesheets/main.css
===================================================================
--- trunk/extensions/FreqPatternTagCloud/stylesheets/main.css 2011-10-20
11:02:33 UTC (rev 100337)
+++ trunk/extensions/FreqPatternTagCloud/stylesheets/main.css 2011-10-20
12:08:16 UTC (rev 100338)
@@ -22,7 +22,7 @@
#fptc_contextMenu .loading,
#fptc_contextMenu .no_entries,
-#fptc_contextMenu .suggestions
+#fptc_contextMenu .fptc_suggestions
{
text-decoration: none;
display: block;
@@ -40,7 +40,7 @@
background-image: url("../images/loading.gif");
}
-#fptc_contextMenu .suggestions
+#fptc_contextMenu .fptc_suggestions
{
font-weight: bold;
}
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
