Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[2115] trunk
|
From: <cs...@us...> - 2010-03-09 16:13:14
|
Revision: 2115
http://openutils.svn.sourceforge.net/openutils/?rev=2115&view=rev
Author: cstrap
Date: 2010-03-09 16:13:07 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
TAGCLOUD-2 Added develop property to dialog: it allows to show the hidden select
New minified fcbkcomplete.js
Modified Paths:
--------------
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl
trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.js
trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.min.js
trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestServletOptions.java
trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestTldLocationsCache.java
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java 2010-03-09 16:13:07 UTC (rev 2115)
@@ -20,6 +20,7 @@
package net.sourceforge.openutils.mgnltagcloud.dialog;
import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.SystemProperty;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
@@ -96,7 +97,8 @@
Collection<String> tagList = new ArrayList<String>();
try
{
- if (getStorageNode() != null && getStorageNode().getNodeData(this.getName()) != null
+ if (getStorageNode() != null
+ && getStorageNode().getNodeData(this.getName()) != null
&& getStorageNode().getNodeData(this.getName()).getValues() != null)
{
for (Value value : getStorageNode().getNodeData(this.getName()).getValues())
@@ -174,25 +176,9 @@
values.put("count", tagCloud.getTags().get(key));
tags.put(key, values);
}
+
parameters.put("configuredTagList", tags);
- // MapUtils.lazyMap(tagCloud.getTags(), new Transformer()
-// {
-//
-// public Object transform(Object input)
-// {
-// Map<String, Object> values = new HashMap<String, Object>(2);
-// values.put("selected", null);
-// values.put("count", tagCloud.getTags().get(input));
-// return null;
-// }
-// }));
-// Content content = hmConfig.getContent("/modules/tagcloud/tagCloudsRepoConfig");
-// content = content.getContent(this.getConfigValue("tagCloudName"));
-// log.info("TagList: {}", content.getNodeData("tagList").getString());
-// String[] configuredTagList = (content.getNodeData("tagList").getString()).split(",");
-//
-
// load the script once: if there are multiple instances
String jQueryAttributeName = "info.magnolia.cms.gui.dialog.jquery.loaded";
boolean includejquery = getRequest().getAttribute(jQueryAttributeName) == null;
@@ -201,5 +187,7 @@
{
getRequest().setAttribute(jQueryAttributeName, "true");
}
+
+ parameters.put("develop", SystemProperty.getBooleanProperty("magnolia.develop"));
}
}
Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java 2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialogSafeMultivalueSaveHandler.java 2010-03-09 16:13:07 UTC (rev 2115)
@@ -91,7 +91,6 @@
}
- @SuppressWarnings("deprecation")
private NodeData getOrCreateAndSet(Content node, String name, Value[] value) throws AccessDeniedException,
RepositoryException
{
Modified: trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl 2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-mgnltagcloud/src/main/resources/dialog/tagcloud.ftl 2010-03-09 16:13:07 UTC (rev 2115)
@@ -1,7 +1,12 @@
[#if includejquery]
<script type="text/javascript" src="${request.contextPath}/.resources/tagcloud/js/jquery.min.js"></script>
[/#if]
+
+[#if develop]
<script type="text/javascript" src="${request.contextPath}/.resources/tagcloud/js/jquery.fcbkcomplete.js"></script>
+[#else]
+<script type="text/javascript" src="${request.contextPath}/.resources/tagcloud/js/jquery.fcbkcomplete.min.js"></script>
+[/#if]
<link rel="stylesheet" type="text/css" href="${request.contextPath}/.resources/tagcloud/css/style.css" />
@@ -14,11 +19,10 @@
[/#if]
</select>
-
-
<script language="JavaScript">
- $(document).ready(function() {
- var tagCloud = $("#${name}");
+ // <![CDATA[
+ jQuery(document).ready(function() {
+ var tagCloud = jQuery("#${name}");
tagCloud.fcbkcomplete({
cache: true,
@@ -30,5 +34,5 @@
maxshownitems: 10
});
});
-
+ // ]]>
</script>
Modified: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.js
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.js 2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.js 2010-03-09 16:13:07 UTC (rev 2115)
@@ -67,7 +67,7 @@
function createFCBK()
{
- element.hide();
+ // This element is hide not in normal mode: element.hide();
/*
* Magnolia FIX
* */
Modified: trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.min.js
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.min.js 2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-mgnltagcloud/src/main/resources/mgnl-resources/tagcloud/js/jquery.fcbkcomplete.min.js 2010-03-09 16:13:07 UTC (rev 2115)
@@ -50,4 +50,4 @@
* onselect - fire event on item select
* onremove - fire event on item remove
*/
-jQuery(function($){$.fn.fcbkcomplete=function(opt){return this.each(function(){function init(){createFCBK();preSet();addInput(0)}function createFCBK(){element.hide();element.attr("multiple","multiple");if(element.attr("name").indexOf("[]")==-1){element.attr("name",element.attr("name")+"[]")}holder=$(document.createElement("ul"));holder.attr("class","holder");element.after(holder);complete=$(document.createElement("div"));complete.addClass("facebook-auto");complete.append('<div class="default">'+options.complete_text+"</div>");if(browser_msie){complete.append('<iframe class="ie6fix" scrolling="no" frameborder="0"></iframe>');browser_msie_frame=complete.children('.ie6fix')}feed=$(document.createElement("ul"));feed.attr("id",elemid+"_feed");complete.prepend(feed);holder.after(complete);feed.css("width",complete.width())}function preSet(){element.children("option").each(function(i,option){option=$(option);if(option.hasClass("selected")){addItem(option.text(),option.val(),true);option.attr("selected","selected")}else{option.removeAttr("selected")}cache.push({caption:option.text(),value:option.val()});search_string+=""+(cache.length-1)+":"+option.text()+";"})}$(this).bind("addItem",function(event,data){addItem(data.title,data.value)});function addItem(title,value,preadded){var li=document.createElement("li");var txt=document.createTextNode(title);var aclose=document.createElement("a");$(li).attr({"class":"bit-box","rel":value});$(li).prepend(txt);$(aclose).attr({"class":"closebutton","href":"#"});li.appendChild(aclose);holder.append(li);$(aclose).click(function(){$(this).parent("li").fadeOut("fast",function(){removeItem($(this))});return false});if(!preadded){$("#"+elemid+"_annoninput").remove();var _item;addInput(1);if(element.children("option[value="+value+"]").length){_item=element.children("option[value="+value+"]");_item.get(0).setAttribute("selected","selected");if(!_item.hasClass("selected")){_item.addClass("selected")}}else{var _item=$(document.createElement("option"));_item.attr("value",value).get(0).setAttribute("selected","selected");_item.attr("value",value).addClass("selected");_item.text(title);element.append(_item)}if(options.onselect.length){funCall(options.onselect,_item)}}holder.children("li.bit-box.deleted").removeClass("deleted");feed.hide();browser_msie?browser_msie_frame.hide():''}function removeItem(item){if(options.onremove.length){var _item=element.children("option[value="+item.attr("rel")+"]");funCall(options.onremove,_item)}element.children("option[value="+item.attr("rel")+"]").removeAttr("selected");element.children("option[value="+item.attr("rel")+"]").removeClass("selected");item.remove();deleting=0}function addInput(focusme){var li=$(document.createElement("li"));var input=$(document.createElement("input"));li.attr({"class":"bit-input","id":elemid+"_annoninput"});input.attr({"type":"text","class":"maininput","size":"1"});holder.append(li.append(input));input.focus(function(){complete.fadeIn("fast")});input.blur(function(){complete.fadeOut("fast")});holder.click(function(){input.focus();if(feed.length&&input.val().length){feed.show()}else{feed.hide();browser_msie?browser_msie_frame.hide():'';complete.children(".default").show()}});input.keypress(function(event){if(event.keyCode==13){return false}input.attr("size",input.val().length+1)});input.keydown(function(event){if(event.keyCode==191){event.preventDefault();return false}});input.keyup(function(event){var etext=xssPrevent(input.val());if(event.keyCode==8&&etext.length==0){feed.hide();browser_msie?browser_msie_frame.hide():'';if(holder.children("li.bit-box.deleted").length==0){holder.children("li.bit-box:last").addClass("deleted");return false}else{if(deleting){return}deleting=1;holder.children("li.bit-box.deleted").fadeOut("fast",function(){removeItem($(this));return false})}}if(event.keyCode!=40&&event.keyCode!=38&&etext.length!=0){counter=0;if(options.json_url){if(options.cache&&json_cache){addMembers(etext);bindEvents()}else{$.getJSON(options.json_url+"?tag="+etext,null,function(data){addMembers(etext,data);json_cache=true;bindEvents()})}}else{addMembers(etext);bindEvents()}complete.children(".default").hide();feed.show()}});if(focusme){setTimeout(function(){input.focus();complete.children(".default").show()},1)}}function addMembers(etext,data){feed.html('');if(!options.cache){cache=new Array();search_string=""}addTextItem(etext);if(data!=null&&data.length){$.each(data,function(i,val){cache.push({caption:val.caption,value:val.value});search_string+=""+(cache.length-1)+":"+val.caption+";"})}var maximum=options.maxshownitems<cache.length?options.maxshownitems:cache.length;var filter="i";if(options.filter_case){filter=""}var myregexp,match;try{myregexp=eval('/(?:^|;)\\s*(\\d+)\\s*:[^;]*?'+etext+'[^;]*/g'+filter);match=myregexp.exec(search_string)}catch(ex){};var content='';while(match!=null&&maximum>0){var id=match[1];var object=cache[id];if(options.filter_selected&&element.children("option[value="+object.value+"]").hasClass("selected")){}else{content+='<li rel="'+object.value+'">'+itemIllumination(object.caption,etext)+'</li>';counter++;maximum--}match=myregexp.exec(search_string)}feed.append(content);if(options.firstselected){focuson=feed.children("li:visible:first");focuson.addClass("auto-focus")}if(counter>options.height){feed.css({"height":(options.height*24)+"px","overflow":"auto"});if(browser_msie){browser_msie_frame.css({"height":(options.height*24)+"px","width":feed.width()+"px"}).show()}}else{feed.css("height","auto");if(browser_msie){browser_msie_frame.css({"height":feed.height()+"px","width":feed.width()+"px"}).show()}}}function itemIllumination(text,etext){if(options.filter_case){try{eval("var text = text.replace(/(.*)("+etext+")(.*)/gi,'$1<em>$2</em>$3');")}catch(ex){}}else{try{eval("var text = text.replace(/(.*)("+etext.toLowerCase()+")(.*)/gi,'$1<em>$2</em>$3');")}catch(ex){}}return text}function bindFeedEvent(){feed.children("li").mouseover(function(){feed.children("li").removeClass("auto-focus");$(this).addClass("auto-focus");focuson=$(this)});feed.children("li").mouseout(function(){$(this).removeClass("auto-focus");focuson=null})}function removeFeedEvent(){feed.children("li").unbind("mouseover");feed.children("li").unbind("mouseout");feed.mousemove(function(){bindFeedEvent();feed.unbind("mousemove")})}function bindEvents(){var maininput=$("#"+elemid+"_annoninput").children(".maininput");bindFeedEvent();feed.children("li").unbind("mousedown");feed.children("li").mousedown(function(){var option=$(this);addItem(option.text(),option.attr("rel"));feed.hide();browser_msie?browser_msie_frame.hide():'';complete.hide()});maininput.unbind("keydown");maininput.keydown(function(event){if(event.keyCode==191){event.preventDefault();return false}if(event.keyCode!=8){holder.children("li.bit-box.deleted").removeClass("deleted")}if(event.keyCode==13&&checkFocusOn()){var option=focuson;addItem(option.text(),option.attr("rel"));complete.hide();event.preventDefault();focuson=null;return false}if(event.keyCode==13&&!checkFocusOn()){if(options.newel){var value=xssPrevent($(this).val());addItem(value,value);complete.hide();event.preventDefault();focuson=null}return false}if(event.keyCode==40){removeFeedEvent();if(focuson==null||focuson.length==0){focuson=feed.children("li:visible:first");feed.get(0).scrollTop=0}else{focuson.removeClass("auto-focus");focuson=focuson.nextAll("li:visible:first");var prev=parseInt(focuson.prevAll("li:visible").length,10);var next=parseInt(focuson.nextAll("li:visible").length,10);if((prev>Math.round(options.height/2)||next<=Math.round(options.height/2))&&typeof(focuson.get(0))!="undefined"){feed.get(0).scrollTop=parseInt(focuson.get(0).scrollHeight,10)*(prev-Math.round(options.height/2))}}feed.children("li").removeClass("auto-focus");focuson.addClass("auto-focus")}if(event.keyCode==38){removeFeedEvent();if(focuson==null||focuson.length==0){focuson=feed.children("li:visible:last");feed.get(0).scrollTop=parseInt(focuson.get(0).scrollHeight,10)*(parseInt(feed.children("li:visible").length,10)-Math.round(options.height/2))}else{focuson.removeClass("auto-focus");focuson=focuson.prevAll("li:visible:first");var prev=parseInt(focuson.prevAll("li:visible").length,10);var next=parseInt(focuson.nextAll("li:visible").length,10);if((next>Math.round(options.height/2)||prev<=Math.round(options.height/2))&&typeof(focuson.get(0))!="undefined"){feed.get(0).scrollTop=parseInt(focuson.get(0).scrollHeight,10)*(prev-Math.round(options.height/2))}}feed.children("li").removeClass("auto-focus");focuson.addClass("auto-focus")}})}function addTextItem(value){if(options.newel){feed.children("li[fckb=1]").remove();if(value.length==0){return}var li=$(document.createElement("li"));li.attr({"rel":value,"fckb":"1"}).html(value);feed.prepend(li);counter++}else{return}}function funCall(func,item){var _object="";for(i=0;i<item.get(0).attributes.length;i++){if(item.get(0).attributes[i].nodeValue!=null){_object+="\"_"+item.get(0).attributes[i].nodeName+"\": \""+item.get(0).attributes[i].nodeValue+"\","}}_object="{"+_object+" notinuse: 0}";try{eval(func+"("+_object+")")}catch(ex){}}function checkFocusOn(){if(focuson==null){return false}if(focuson.length==0){return false}return true}function xssPrevent(string){string=string.replace(/[\"\'][\s]*javascript:(.*)[\"\']/g,"\"\"");string=string.replace(/script(.*)/g,"");string=string.replace(/eval\((.*)\)/g,"");string=string.replace('/([\x00-\x08,\x0b-\x0c,\x0e-\x19])/','');return string}var options=$.extend({json_url:null,cache:false,height:"10",newel:false,firstselected:false,filter_case:false,filter_hide:false,complete_text:"Start to type...",maxshownitems:30,onselect:"",onremove:""},opt);var holder=null;var feed=null;var complete=null;var counter=0;var cache=new Array();var json_cache=false;var search_string="";var focuson=null;var deleting=0;var browser_msie="\v"=="v";var browser_msie_frame;var element=$(this);var elemid=element.attr("id");init();return this})}});
\ No newline at end of file
+jQuery(function($){$.fn.fcbkcomplete=function(opt){return this.each(function(){function init(){createFCBK();preSet();addInput(0)}function createFCBK(){element.hide();holder=$(document.createElement("ul"));holder.attr("class","holder");element.after(holder);complete=$(document.createElement("div"));complete.addClass("facebook-auto");complete.append('<div class="default">'+options.complete_text+"</div>");if(browser_msie){complete.append('<iframe class="ie6fix" scrolling="no" frameborder="0"></iframe>');browser_msie_frame=complete.children(".ie6fix")}feed=$(document.createElement("ul"));feed.attr("id",elemid+"_feed");complete.prepend(feed);holder.after(complete);feed.css("width",complete.width())}function preSet(){element.children("option").each(function(i,option){option=$(option);if(option.hasClass("selected")){addItem(option.text(),option.val(),true);option.attr("selected","selected")}else{option.removeAttr("selected")}cache.push({caption:option.text(),value:option.val()});search_string+=""+(cache.length-1)+":"+option.text()+";"})}$(this).bind("addItem",function(event,data){addItem(data.title,data.value)});function addItem(title,value,preadded){var li=document.createElement("li");var txt=document.createTextNode(title.replace(/\s\(\d\)/,""));var aclose=document.createElement("a");$(li).attr({"class":"bit-box",rel:value});$(li).prepend(txt);$(aclose).attr({"class":"closebutton",href:"#"});li.appendChild(aclose);holder.append(li);$(aclose).click(function(){$(this).parent("li").fadeOut("fast",function(){removeItem($(this))});return false});if(!preadded){$("#"+elemid+"_annoninput").remove();var _item;addInput(1);if(element.children("option[value="+value+"]").length){_item=element.children("option[value="+value+"]");_item.get(0).setAttribute("selected","selected");if(!_item.hasClass("selected")){_item.addClass("selected")}}else{var _item=$(document.createElement("option"));_item.attr("value",value).get(0).setAttribute("selected","selected");_item.attr("value",value).addClass("selected");_item.text(title);element.append(_item)}if(options.onselect.length){funCall(options.onselect,_item)}}holder.children("li.bit-box.deleted").removeClass("deleted");feed.hide();browser_msie?browser_msie_frame.hide():""}function removeItem(item){if(options.onremove.length){var _item=element.children("option[value="+item.attr("rel")+"]");funCall(options.onremove,_item)}element.children("option[value="+item.attr("rel")+"]").removeAttr("selected");element.children("option[value="+item.attr("rel")+"]").removeClass("selected");item.remove();deleting=0}function addInput(focusme){var li=$(document.createElement("li"));var input=$(document.createElement("input"));li.attr({"class":"bit-input",id:elemid+"_annoninput"});input.attr({type:"text","class":"maininput",size:"1"});holder.append(li.append(input));input.focus(function(){complete.fadeIn("fast")});input.blur(function(){complete.fadeOut("fast")});holder.click(function(){input.focus();if(feed.length&&input.val().length){feed.show()}else{feed.hide();browser_msie?browser_msie_frame.hide():"";complete.children(".default").show()}});input.keypress(function(event){if(event.keyCode==13||event.keyCode==188){return false}input.attr("size",input.val().length+1)});input.keydown(function(event){if(event.keyCode==191){event.preventDefault();return false}});input.keyup(function(event){var etext=xssPrevent(input.val());if(event.keyCode==8&&etext.length==0){feed.hide();browser_msie?browser_msie_frame.hide():"";if(holder.children("li.bit-box.deleted").length==0){holder.children("li.bit-box:last").addClass("deleted");return false}else{if(deleting){return}deleting=1;holder.children("li.bit-box.deleted").fadeOut("fast",function(){removeItem($(this));return false})}}if(event.keyCode!=40&&event.keyCode!=38&&etext.length!=0){counter=0;if(options.json_url){if(options.cache&&json_cache){addMembers(etext);bindEvents()}else{$.getJSON(options.json_url+"?tag="+etext,null,function(data){addMembers(etext,data);json_cache=true;bindEvents()})}}else{addMembers(etext);bindEvents()}complete.children(".default").hide();feed.show()}});if(focusme){setTimeout(function(){input.focus();complete.children(".default").show()},1)}}function addMembers(etext,data){feed.html("");if(!options.cache){cache=new Array();search_string=""}addTextItem(etext);if(data!=null&&data.length){$.each(data,function(i,val){cache.push({caption:val.caption,value:val.value});search_string+=""+(cache.length-1)+":"+val.caption+";"})}var maximum=options.maxshownitems<cache.length?options.maxshownitems:cache.length;var filter="i";if(options.filter_case){filter=""}var myregexp,match;try{myregexp=eval("/(?:^|;)\\s*(\\d+)\\s*:[^;]*?"+etext+"[^;]*/g"+filter);match=myregexp.exec(search_string)}catch(ex){}var content="";while(match!=null&&maximum>0){var id=match[1];var object=cache[id];if(options.filter_selected&&element.children("option[value="+object.value+"]").hasClass("selected")){}else{content+='<li rel="'+object.value+'">'+itemIllumination(object.caption,etext)+"</li>";counter++;maximum--}match=myregexp.exec(search_string)}feed.append(content);if(options.firstselected){focuson=feed.children("li:visible:first");focuson.addClass("auto-focus")}if(counter>options.height){feed.css({height:(options.height*24)+"px",overflow:"auto"});if(browser_msie){browser_msie_frame.css({height:(options.height*24)+"px",width:feed.width()+"px"}).show()}}else{feed.css("height","auto");if(browser_msie){browser_msie_frame.css({height:feed.height()+"px",width:feed.width()+"px"}).show()}}}function itemIllumination(text,etext){if(options.filter_case){try{eval("var text = text.replace(/(.*)("+etext+")(.*)/gi,'$1<em>$2</em>$3');")}catch(ex){}}else{try{eval("var text = text.replace(/(.*)("+etext.toLowerCase()+")(.*)/gi,'$1<em>$2</em>$3');")}catch(ex){}}return text}function bindFeedEvent(){feed.children("li").mouseover(function(){feed.children("li").removeClass("auto-focus");$(this).addClass("auto-focus");focuson=$(this)});feed.children("li").mouseout(function(){$(this).removeClass("auto-focus");focuson=null})}function removeFeedEvent(){feed.children("li").unbind("mouseover");feed.children("li").unbind("mouseout");feed.mousemove(function(){bindFeedEvent();feed.unbind("mousemove")})}function bindEvents(){var maininput=$("#"+elemid+"_annoninput").children(".maininput");bindFeedEvent();feed.children("li").unbind("mousedown");feed.children("li").mousedown(function(){var option=$(this);addItem(option.text(),option.attr("rel"));feed.hide();browser_msie?browser_msie_frame.hide():"";complete.hide()});maininput.unbind("keydown");maininput.keydown(function(event){if(event.keyCode==191){event.preventDefault();return false}if(event.keyCode!=8){holder.children("li.bit-box.deleted").removeClass("deleted")}if((event.keyCode==13||event.keyCode==188)&&checkFocusOn()){var option=focuson;addItem(option.text(),option.attr("rel"));complete.hide();event.preventDefault();focuson=null;return false}if((event.keyCode==13||event.keyCode==188)&&!checkFocusOn()){if(options.newel){var value=xssPrevent($(this).val());addItem(value,value);complete.hide();event.preventDefault();focuson=null}return false}if(event.keyCode==40){removeFeedEvent();if(focuson==null||focuson.length==0){focuson=feed.children("li:visible:first");feed.get(0).scrollTop=0}else{focuson.removeClass("auto-focus");focuson=focuson.nextAll("li:visible:first");var prev=parseInt(focuson.prevAll("li:visible").length,10);var next=parseInt(focuson.nextAll("li:visible").length,10);if((prev>Math.round(options.height/2)||next<=Math.round(options.height/2))&&typeof(focuson.get(0))!="undefined"){feed.get(0).scrollTop=parseInt(focuson.get(0).scrollHeight,10)*(prev-Math.round(options.height/2))}}feed.children("li").removeClass("auto-focus");focuson.addClass("auto-focus")}if(event.keyCode==38){removeFeedEvent();if(focuson==null||focuson.length==0){focuson=feed.children("li:visible:last");feed.get(0).scrollTop=parseInt(focuson.get(0).scrollHeight,10)*(parseInt(feed.children("li:visible").length,10)-Math.round(options.height/2))}else{focuson.removeClass("auto-focus");focuson=focuson.prevAll("li:visible:first");var prev=parseInt(focuson.prevAll("li:visible").length,10);var next=parseInt(focuson.nextAll("li:visible").length,10);if((next>Math.round(options.height/2)||prev<=Math.round(options.height/2))&&typeof(focuson.get(0))!="undefined"){feed.get(0).scrollTop=parseInt(focuson.get(0).scrollHeight,10)*(prev-Math.round(options.height/2))}}feed.children("li").removeClass("auto-focus");focuson.addClass("auto-focus")}})}function addTextItem(value){if(options.newel){feed.children("li[fckb=1]").remove();if(value.length==0){return}var li=$(document.createElement("li"));li.attr({rel:value,fckb:"1"}).html(value);feed.prepend(li);counter++}else{return}}function funCall(func,item){var _object="";for(i=0;i<item.get(0).attributes.length;i++){if(item.get(0).attributes[i].nodeValue!=null){_object+='"_'+item.get(0).attributes[i].nodeName+'": "'+item.get(0).attributes[i].nodeValue+'",'}}_object="{"+_object+" notinuse: 0}";try{eval(func+"("+_object+")")}catch(ex){}}function checkFocusOn(){if(focuson==null){return false}if(focuson.length==0){return false}return true}function xssPrevent(string){string=string.replace(/[\"\'][\s]*javascript:(.*)[\"\']/g,'""');string=string.replace(/script(.*)/g,"");string=string.replace(/eval\((.*)\)/g,"");string=string.replace("/([\x00-\x08,\x0b-\x0c,\x0e-\x19])/","");return string}var options=$.extend({json_url:null,cache:false,height:"10",newel:false,firstselected:false,filter_case:false,filter_hide:false,complete_text:"Start to type...",maxshownitems:30,onselect:"",onremove:""},opt);var holder=null;var feed=null;var complete=null;var counter=0;var cache=new Array();var json_cache=false;var search_string="";var focuson=null;var deleting=0;var browser_msie="\v"=="v";var browser_msie_frame;var element=$(this);var elemid=element.attr("id");init();return this})}});
\ No newline at end of file
Modified: trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java 2010-03-09 16:13:07 UTC (rev 2115)
@@ -228,7 +228,6 @@
assertEquals(tags.get("tag1 tag4"), mapProperties.get("max"));
}
- @SuppressWarnings("deprecation")
@Override
protected void setUp() throws Exception
{
Modified: trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestServletOptions.java
===================================================================
--- trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestServletOptions.java 2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestServletOptions.java 2010-03-09 16:13:07 UTC (rev 2115)
@@ -55,6 +55,7 @@
* @return
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode()
{
return options.hashCode();
@@ -65,6 +66,7 @@
* @return
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj)
{
return options.equals(obj);
@@ -355,6 +357,7 @@
* @return
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return options.toString();
Modified: trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestTldLocationsCache.java
===================================================================
--- trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestTldLocationsCache.java 2010-03-08 17:50:58 UTC (rev 2114)
+++ trunk/openutils-testing4web/src/main/java/net/sourceforge/openutils/testing4web/TestTldLocationsCache.java 2010-03-09 16:13:07 UTC (rev 2115)
@@ -82,6 +82,7 @@
ctxt2 = ctxt;
}
+ @Override
public String[] getLocation(String uri) throws JasperException
{
if (!initialized)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
