March 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r13024 - trunk/test-applications/richfaces-docs.

by richfaces-svn-commits＠lists.jboss.org

Author: msorokin Date: 2009-03-19 10:38:10 -0400 (Thu, 19 Mar 2009) New Revision: 13024 Modified: trunk/test-applications/richfaces-docs/pom.xml Log: https://jira.jboss.org/jira/browse/RF-6419 Added new sections and fixed menu Modified: trunk/test-applications/richfaces-docs/pom.xml =================================================================== --- trunk/test-applications/richfaces-docs/pom.xml 2009-03-19 14:33:19 UTC (rev 13023) +++ trunk/test-applications/richfaces-docs/pom.xml 2009-03-19 14:38:10 UTC (rev 13024) @@ -47,8 +47,35 @@ <module>ejb</module> <module>web</module> </modules> + + + <build> + + + + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId>

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r13023 - Plan and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: mvitenkov Date: 2009-03-19 10:33:19 -0400 (Thu, 19 Mar 2009) New Revision: 13023 Modified: trunk/test-applications/qa/Test Plan/TestPlan-RF.doc Log: Add link to selenium test reports on Hudson. Modified: trunk/test-applications/qa/Test Plan/TestPlan-RF.doc =================================================================== (Binary files differ)

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r13022 - in trunk/test-applications/realworld2/web: src/main/resources and 5 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alevkovsky Date: 2009-03-19 07:41:07 -0400 (Thu, 19 Mar 2009) New Revision: 13022 Modified: trunk/test-applications/realworld2/web/META-INF/MANIFEST.MF trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageAdditionalInfo.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/slideshow.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchWidget.xhtml trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css Log: Realworld bugs fixing Modified: trunk/test-applications/realworld2/web/META-INF/MANIFEST.MF =================================================================== --- trunk/test-applications/realworld2/web/META-INF/MANIFEST.MF 2009-03-19 01:45:20 UTC (rev 13021) +++ trunk/test-applications/realworld2/web/META-INF/MANIFEST.MF 2009-03-19 11:41:07 UTC (rev 13022) @@ -1,8 +1,8 @@ Manifest-Version: 1.0 Class-Path: avalon-framework-4.1.3.jar commons-beanutils-1.7.0.jar com - mons-digester-2.0.jar commons-logging-1.1.jar jboss-seam-debug-2.1.0. + mons-digester-1.8.jar commons-logging-1.1.jar jboss-seam-debug-2.1.0. SP1.jar jboss-seam-jul-2.1.0.SP1.jar jboss-seam-remoting-2.1.0.SP1.ja r jboss-seam-ui-2.1.0.SP1.jar jsf-facelets-1.1.14.jar junit-3.8.jar l og4j-1.2.14.jar logkit-1.0.1.jar metadata-extractor-2.4.0-beta1.jar r - ichfaces-impl-3.3.1-SNAPSHOT.jar richfaces-ui-3.3.1-SNAPSHOT.jar + ichfaces-impl-3.3.0.GA.jar richfaces-ui-3.3.0.GA.jar Modified: trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties =================================================================== --- trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties 2009-03-19 01:45:20 UTC (rev 13021) +++ trunk/test-applications/realworld2/web/src/main/resources/messages_en.properties 2009-03-19 11:41:07 UTC (rev 13022) @@ -226,7 +226,7 @@ user.informaboutnews=Inform me about news in RealWorld Demo user.changeavatar=Change avatar -menu.welcome=Welcome, #{identity.username}! +menu.welcome=Welcome, menu.welcome.guest=Welcome, guest! If you want access to full version of application, please register or login. menu.message.tooltip=You have #{messageManager.countUnreadedMessages} not-readed messages menu.messages=Read Messages Modified: trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties =================================================================== --- trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties 2009-03-19 01:45:20 UTC (rev 13021) +++ trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties 2009-03-19 11:41:07 UTC (rev 13022) @@ -166,7 +166,7 @@ user.informaboutnews=\u0418\u043D\u0444\u043E\u0440\u043C\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043C\u0435\u043D\u044F \u043E \u043D\u043E\u0432\u043E\u0441\u0442\u044F\u0445 user.changeavatar=\u0421\u043C\u0435\u043D\u0438\u0442\u044C \u0430\u0432\u0430\u0442\u0430\u0440 -menu.welcome=\u0414\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C, \#{identity.username}\! +menu.welcome=\u0414\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C, menu.welcome.guest=\u0414\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C, \u0433\u043E\u0441\u0442\u044C\! \u0415\u0441\u043B\u0438 \u0432\u044B \u0445\u043E\u0442\u0438\u0442\u0435 \u0438\u043C\u0435\u0442\u044C \u0434\u043E\u0441\u0442\u0443\u043F \u043A\u043E \u0432\u0441\u0435\u043C \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044F\u043C \u0441\u0438\u0441\u0442\u0435\u043C\u044B, \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0443\u0439\u0442\u0435\u0441\u044C menu.message.tooltip=\u0423 \u0432\u0430\u0441 \#{messageManager.countUnreadedMessages} \u043D\u0435\u043F\u0440\u043E\u0447\u0438\u0442\u0430\u043D\u043D\u044B\u0445 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 menu.messages=\u0421\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/albumPreview.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageAdditionalInfo.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/imageInfo.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/slideshow.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchWidget.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/template.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css 2009-03-19 01:45:20 UTC (rev 13021) +++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css 2009-03-19 11:41:07 UTC (rev 13022) @@ -717,4 +717,8 @@ text-decoration: none; font-weight: normal; padding: 0px 0px 0px 15px; -} \ No newline at end of file +} +.slideshow-link{ + color:black; + text-decoration:none; +}

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r13021 - trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2009-03-18 21:45:20 -0400 (Wed, 18 Mar 2009) New Revision: 13021 Modified: trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js Log: https://jira.jboss.org/jira/browse/RF-6519 - fixed Modified: trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js =================================================================== --- trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js 2009-03-19 01:38:16 UTC (rev 13020) +++ trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.colorpicker.js 2009-03-19 01:45:20 UTC (rev 13021) @@ -298,12 +298,12 @@ var RGBCol = this._HSBToRGB(col); this._trigger("submit", e, { options: this.options, hex: '#'+this._HSBToHex(col), rgb: 'rgb('+RGBCol.r+', '+RGBCol.g+', '+RGBCol.b+')' }); this.picker.hide(); - $(document).unbind('mousedown.colorPicker'); + $(window).unbind('mousedown.colorPicker'); return false; }, _clickCancel: function(e) { this.picker.hide(); - $(document).unbind('mousedown.colorPicker'); + $(window).unbind('mousedown.colorPicker'); return false; }, _show: function(e) { @@ -332,7 +332,7 @@ } var self = this; - $(document).bind('mousedown.colorPicker', function(e) { return self._hide.call(self, e); }); + $(window).bind('mousedown.colorPicker', function(e) { return self._hide.call(self, e); }); return false; }, Modified: trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js =================================================================== --- trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js 2009-03-19 01:38:16 UTC (rev 13020) +++ trunk/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/scripts/ui.core.js 2009-03-19 01:45:20 UTC (rev 13021) @@ -1,426 +1,10 @@ -;(function($) { - -/** jQuery core modifications and additions **/ - -var _remove = $.fn.remove; -$.fn.remove = function() { - $("*", this).add(this).triggerHandler("remove"); - return _remove.apply(this, arguments ); -}; - -function isVisible(element) { - function checkStyles(element) { - var style = element.style; - return (style.display != 'none' && style.visibility != 'hidden'); - } - - var visible = checkStyles(element); - - (visible && $.each($.dir(element, 'parentNode'), function() { - return (visible = checkStyles(this)); - })); - - return visible; -} - -$.extend($.expr[':'], { - data: function(a, i, m) { - return $.data(a, m[3]); - }, - - // TODO: add support for object, area - tabbable: function(a, i, m) { - var nodeName = a.nodeName.toLowerCase(); - - return ( - // in tab order - a.tabIndex >= 0 && - - ( // filter node types that participate in the tab order - - // anchor tag - ('a' == nodeName && a.href) || - - // enabled form element - (/input|select|textarea|button/.test(nodeName) && - 'hidden' != a.type && !a.disabled) - ) && - - // visible on page - isVisible(a) - ); - } -}); - -$.keyCode = { - BACKSPACE: 8, - CAPS_LOCK: 20, - COMMA: 188, - CONTROL: 17, - DELETE: 46, - DOWN: 40, - END: 35, - ENTER: 13, - ESCAPE: 27, - HOME: 36, - INSERT: 45, - LEFT: 37, - NUMPAD_ADD: 107, - NUMPAD_DECIMAL: 110, - NUMPAD_DIVIDE: 111, - NUMPAD_ENTER: 108, - NUMPAD_MULTIPLY: 106, - NUMPAD_SUBTRACT: 109, - PAGE_DOWN: 34, - PAGE_UP: 33, - PERIOD: 190, - RIGHT: 39, - SHIFT: 16, - SPACE: 32, - TAB: 9, - UP: 38 -}; - -// $.widget is a factory to create jQuery plugins -// taking some boilerplate code out of the plugin code -// created by Scott González and Jörn Zaefferer -function getter(namespace, plugin, method, args) { - function getMethods(type) { - var methods = $[namespace][plugin][type] || []; - return (typeof methods == 'string' ? methods.split(/,?\s+/) : methods); - } - - var methods = getMethods('getter'); - if (args.length == 1 && typeof args[0] == 'string') { - methods = methods.concat(getMethods('getterSetter')); - } - return ($.inArray(method, methods) != -1); -} - -$.widget = function(name, prototype) { - var namespace = name.split(".")[0]; - name = name.split(".")[1]; - - // create plugin method - $.fn[name] = function(options) { - var isMethodCall = (typeof options == 'string'), - args = Array.prototype.slice.call(arguments, 1); - - // prevent calls to internal methods - if (isMethodCall && options.substring(0, 1) == '_') { - return this; - } - - // handle getter methods - if (isMethodCall && getter(namespace, name, options, args)) { - var instance = $.data(this[0], name); - return (instance ? instance[options].apply(instance, args) - : undefined); - } - - // handle initialization and non-getter methods - return this.each(function() { - var instance = $.data(this, name); - - // constructor - (!instance && !isMethodCall && - $.data(this, name, new $[namespace][name](this, options))); - - // method call - (instance && isMethodCall && $.isFunction(instance[options]) && - instance[options].apply(instance, args)); - }); - }; - - // create widget constructor - $[namespace][name] = function(element, options) { - var self = this; - - this.widgetName = name; - this.widgetEventPrefix = $[namespace][name].eventPrefix || name; - this.widgetBaseClass = namespace + '-' + name; - - this.options = $.extend({}, - $.widget.defaults, - $[namespace][name].defaults, - $.metadata && $.metadata.get(element)[name], - options); - - this.element = $(element) - .bind('setData.' + name, function(e, key, value) { - return self._setData(key, value); - }) - .bind('getData.' + name, function(e, key) { - return self._getData(key); - }) - .bind('remove', function() { - return self.destroy(); - }); - - this._init(); - }; - - // add widget prototype - $[namespace][name].prototype = $.extend({}, $.widget.prototype, prototype); - - // TODO: merge getter and getterSetter properties from widget prototype - // and plugin prototype - $[namespace][name].getterSetter = 'option'; -}; - -$.widget.prototype = { - _init: function() {}, - destroy: function() { - this.element.removeData(this.widgetName); - }, - - option: function(key, value) { - var options = key, - self = this; - - if (typeof key == "string") { - if (value === undefined) { - return this._getData(key); - } - options = {}; - options[key] = value; - } - - $.each(options, function(key, value) { - self._setData(key, value); - }); - }, - _getData: function(key) { - return this.options[key]; - }, - _setData: function(key, value) { - this.options[key] = value; - - if (key == 'disabled') { - this.element[value ? 'addClass' : 'removeClass']( - this.widgetBaseClass + '-disabled'); - } - }, - - enable: function() { - this._setData('disabled', false); - }, - disable: function() { - this._setData('disabled', true); - }, - - _trigger: function(type, e, data) { - var eventName = (type == this.widgetEventPrefix - ? type : this.widgetEventPrefix + type); - e = e || $.event.fix({ type: eventName, target: this.element[0] }); - return this.element.triggerHandler(eventName, [e, data], this.options[type]); - } -}; - -$.widget.defaults = { - disabled: false -}; - - -/** jQuery UI core **/ - -$.ui = { - plugin: { - add: function(module, option, set) { - var proto = $.ui[module].prototype; - for(var i in set) { - proto.plugins[i] = proto.plugins[i] || []; - proto.plugins[i].push([option, set[i]]); - } - }, - call: function(instance, name, args) { - var set = instance.plugins[name]; - if(!set) { return; } - - for (var i = 0; i < set.length; i++) { - if (instance.options[set[i][0]]) { - set[i][1].apply(instance.element, args); - } - } - } - }, - cssCache: {}, - css: function(name) { - if ($.ui.cssCache[name]) { return $.ui.cssCache[name]; } - var tmp = $('<div class="ui-gen">').addClass(name).css({position:'absolute', top:'-5000px', left:'-5000px', display:'block'}).appendTo('body'); - - //if (!$.browser.safari) - //tmp.appendTo('body'); - - //Opera and Safari set width and height to 0px instead of auto - //Safari returns rgba(0,0,0,0) when bgcolor is not set - $.ui.cssCache[name] = !!( - (!(/auto|default/).test(tmp.css('cursor')) || (/^[1-9]/).test(tmp.css('height')) || (/^[1-9]/).test(tmp.css('width')) || - !(/none/).test(tmp.css('backgroundImage')) || !(/transparent|rgba$0, 0, 0, 0$/).test(tmp.css('backgroundColor'))) - ); - try { $('body').get(0).removeChild(tmp.get(0)); } catch(e){} - return $.ui.cssCache[name]; - }, - disableSelection: function(el) { - return $(el) - .attr('unselectable', 'on') - .css('MozUserSelect', 'none') - .bind('selectstart.ui', function() { return false; }); - }, - enableSelection: function(el) { - return $(el) - .attr('unselectable', 'off') - .css('MozUserSelect', '') - .unbind('selectstart.ui'); - }, - hasScroll: function(e, a) { - - //If overflow is hidden, the element might have extra content, but the user wants to hide it - if ($(e).css('overflow') == 'hidden') { return false; } - - var scroll = (a && a == 'left') ? 'scrollLeft' : 'scrollTop', - has = false; - - if (e[scroll] > 0) { return true; } - - // TODO: determine which cases actually cause this to happen - // if the element doesn't have the scroll set, see if it's possible to - // set the scroll - e[scroll] = 1; - has = (e[scroll] > 0); - e[scroll] = 0; - return has; - } -}; - - -/** Mouse Interaction Plugin **/ - -$.ui.mouse = { - _mouseInit: function() { - var self = this; - - this.element.bind('mousedown.'+this.widgetName, function(e) { - return self._mouseDown(e); - }); - - // Prevent text selection in IE - if ($.browser.msie) { - this._mouseUnselectable = this.element.attr('unselectable'); - this.element.attr('unselectable', 'on'); - } - - this.started = false; - }, - - // TODO: make sure destroying one instance of mouse doesn't mess with - // other instances of mouse - _mouseDestroy: function() { - this.element.unbind('.'+this.widgetName); - - // Restore text selection in IE - ($.browser.msie - && this.element.attr('unselectable', this._mouseUnselectable)); - }, - - _mouseDown: function(e) { - // we may have missed mouseup (out of window) - (this._mouseStarted && this._mouseUp(e)); - - this._mouseDownEvent = e; - - var self = this, - btnIsLeft = (e.which == 1), - elIsCancel = (typeof this.options.cancel == "string" ? $(e.target).parents().add(e.target).filter(this.options.cancel).length : false); - if (!btnIsLeft || elIsCancel || !this._mouseCapture(e)) { - return true; - } - - this.mouseDelayMet = !this.options.delay; - if (!this.mouseDelayMet) { - this._mouseDelayTimer = setTimeout(function() { - self.mouseDelayMet = true; - }, this.options.delay); - } - - if (this._mouseDistanceMet(e) && this._mouseDelayMet(e)) { - this._mouseStarted = (this._mouseStart(e) !== false); - if (!this._mouseStarted) { - e.preventDefault(); - return true; - } - } - - // these delegates are required to keep context - this._mouseMoveDelegate = function(e) { - return self._mouseMove(e); - }; - this._mouseUpDelegate = function(e) { - return self._mouseUp(e); - }; - $(document) - .bind('mousemove.'+this.widgetName, this._mouseMoveDelegate) - .bind('mouseup.'+this.widgetName, this._mouseUpDelegate); - - return false; - }, - - _mouseMove: function(e) { - // IE mouseup check - mouseup happened when mouse was out of window - if ($.browser.msie && !e.button) { - return this._mouseUp(e); - } - - if (this._mouseStarted) { - this._mouseDrag(e); - return false; - } - - if (this._mouseDistanceMet(e) && this._mouseDelayMet(e)) { - this._mouseStarted = - (this._mouseStart(this._mouseDownEvent, e) !== false); - (this._mouseStarted ? this._mouseDrag(e) : this._mouseUp(e)); - } - - return !this._mouseStarted; - }, - - _mouseUp: function(e) { - $(document) - .unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate) - .unbind('mouseup.'+this.widgetName, this._mouseUpDelegate); - - if (this._mouseStarted) { - this._mouseStarted = false; - this._mouseStop(e); - } - - return false; - }, - - _mouseDistanceMet: function(e) { - return (Math.max( - Math.abs(this._mouseDownEvent.pageX - e.pageX), - Math.abs(this._mouseDownEvent.pageY - e.pageY) - ) >= this.options.distance - ); - }, - - _mouseDelayMet: function(e) { - return this.mouseDelayMet; - }, - - // These are placeholder methods, to be overriden by extending plugin - _mouseStart: function(e) {}, - _mouseDrag: function(e) {}, - _mouseStop: function(e) {}, - _mouseCapture: function(e) { return true; } -}; - -$.ui.mouse.defaults = { - cancel: null, - distance: 1, - delay: 0 -}; - -})(jQuery); +/* + * jQuery UI 1.7 + * + * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * http://docs.jquery.com/UI + */ +jQuery.ui||(function(c){var i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.7",plugin:{add:function(k,l,n){var m=c.ui[k].prototype;for(var j in n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var n=j.plugins[l];if(!n||!j.element[0].parentNode){return}for(var m=0;m<n.length;m++){if(j.options[n[m][0]]){n[m][1].apply(j.element,k)}}}},contains:function(k,j){return document.compareDocumentPosition?k.compareDocumentPosition(j)&16:k!==j&&k.contains(j)},hasScroll:function(m,k){if(c(m).css("overflow")=="hidden"){return false}var j=(k&&k=="left")?"scrollLeft":"scrollTop",l=false;if(m[j]>0){return true}m[j]=1;l=(m[j]>0);m[j]=0;return l},isOverAxis:function(k,j,l){return(k>j)&&(k<(j+l))},isOver:function(o,k,n,m,j,l){return c.ui.isOverAxis(o,n,j)&&c.ui.isOverAxis(k,m,l)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,NUM! PAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};if(d){var f=c.attr,e=c.fn.removeAttr,h="http://www.w3.org/2005/07/aaa",a=/^aria-/,b=/^wairole:/;c.attr=function(k,j,l){var m=l!==undefined;return(j=="role"?(m?f.call(this,k,j,"wairole:"+l):(f.apply(this,arguments)||"").replace(b,"")):(a.test(j)?(m?k.setAttributeNS(h,j.replace(a,"aaa:"),l):f.call(this,k,j.replace(a,"aaa:"))):f.apply(this,arguments)))};c.fn.removeAttr=function(j){return(a.test(j)?this.each(function(){this.removeAttributeNS(h,j.replace(a,""))}):e.call(this,j))}}c.fn.extend({remove:function(){c("*",this).add(this).each(function(){c(this).triggerHandler("remove")});return i.apply(this,arguments)},enableSelection:function(){return this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return this.attr("unselectable","on").css("MozUserSelect","no! ne").bind("selectstart.ui",function(){return false})},scrollParent:fun ction(){var j;if((c.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){j=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(c.curCSS(this,"position",1))&&(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}else{j=this.parents().filter(function(){return(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!j.length?c(document):j}});c.extend(c.expr[":"],{data:function(l,k,j){return !!c.data(l,j[3])},focusable:function(k){var l=k.nodeName.toLowerCase(),j=c.attr(k,"tabindex");return(/input|select|textarea|button|object/.test(l)?!k.disabled:"a"==l||"area"==l?k.href||!isNaN(j):!isNaN(j))&&!c(k)["area"==l?"parents":"closest"](":hidden").length},tabbable:function(k){var j=c.attr(k,"tabindex");return(isNaN(j)||j>=0)&&c(k).is(":focus! able")}});function g(m,n,o,l){function k(q){var p=c[m][n][q]||[];return(typeof p=="string"?p.split(/,?\s+/):p)}var j=k("getter");if(l.length==1&&typeof l[0]=="string"){j=j.concat(k("getterSetter"))}return(c.inArray(o,j)!=-1)}c.widget=function(k,j){var l=k.split(".")[0];k=k.split(".")[1];c.fn[k]=function(p){var n=(typeof p=="string"),o=Array.prototype.slice.call(arguments,1);if(n&&p.substring(0,1)=="_"){return this}if(n&&g(l,k,p,o)){var m=c.data(this[0],k);return(m?m[p].apply(m,o):undefined)}return this.each(function(){var q=c.data(this,k);(!q&&!n&&c.data(this,k,new c[l][k](this,p))._init());(q&&n&&c.isFunction(q[p])&&q[p].apply(q,o))})};c[l]=c[l]||{};c[l][k]=function(o,n){var m=this;this.namespace=l;this.widgetName=k;this.widgetEventPrefix=c[l][k].eventPrefix||k;this.widgetBaseClass=l+"-"+k;this.options=c.extend({},c.widget.defaults,c[l][k].defaults,c.metadata&&c.metadata.get(o)[k],n);this.element=c(o).bind("setData."+k,function(q,p,r){if(q.target==o){return m._setData(p,r)! }}).bind("getData."+k,function(q,p){if(q.target==o){return m._getData( p)}}).bind("remove",function(){return m.destroy()})};c[l][k].prototype=c.extend({},c.widget.prototype,j);c[l][k].getterSetter="option"};c.widget.prototype={_init:function(){},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled")},option:function(l,m){var k=l,j=this;if(typeof l=="string"){if(m===undefined){return this._getData(l)}k={};k[l]=m}c.each(k,function(n,o){j._setData(n,o)})},_getData:function(j){return this.options[j]},_setData:function(j,k){this.options[j]=k;if(j=="disabled"){this.element[k?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",k)}},enable:function(){this._setData("disabled",false)},disable:function(){this._setData("disabled",true)},_trigger:function(l,m,n){var p=this.options[l],j=(l==this.widgetEventPrefix?l:this.widgetEventPrefix+l);m=c.Event(m);m.type=j;if(m.originalEvent){for! (var k=c.event.props.length,o;k;){o=c.event.props[--k];m[o]=m.originalEvent[o]}}this.element.trigger(m,n);return !(c.isFunction(p)&&p.call(this.element[0],m,n)===false||m.isDefaultPrevented())}};c.widget.defaults={disabled:false};c.ui.mouse={_mouseInit:function(){var j=this;this.element.bind("mousedown."+this.widgetName,function(k){return j._mouseDown(k)}).bind("click."+this.widgetName,function(k){if(j._preventClickEvent){j._preventClickEvent=false;k.stopImmediatePropagation();return false}});if(c.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable","on")}this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName);(c.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable))},_mouseDown:function(l){l.originalEvent=l.originalEvent||{};if(l.originalEvent.mouseHandled){return}(this._mouseStarted&&this._mouseUp(l));this._mouseDownEvent=l;var k=this,m=(l.which==1),j=(typeof this.options.c! ancel=="string"?c(l.target).parents().add(l.target).filter(this.option s.cancel).length:false);if(!m||j||!this._mouseCapture(l)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){k.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(l)&&this._mouseDelayMet(l)){this._mouseStarted=(this._mouseStart(l)!==false);if(!this._mouseStarted){l.preventDefault();return true}}this._mouseMoveDelegate=function(n){return k._mouseMove(n)};this._mouseUpDelegate=function(n){return k._mouseUp(n)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);(c.browser.safari||l.preventDefault());l.originalEvent.mouseHandled=true;return true},_mouseMove:function(j){if(c.browser.msie&&!j.button){return this._mouseUp(j)}if(this._mouseStarted){this._mouseDrag(j);return j.preventDefault()}if(this._mouseDistanceMet(j)&&this._mouseDelayMet(j)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,j)!==false);(this._mouseSt! arted?this._mouseDrag(j):this._mouseUp(j))}return !this._mouseStarted},_mouseUp:function(j){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=(j.target==this._mouseDownEvent.target);this._mouseStop(j)}return false},_mouseDistanceMet:function(j){return(Math.max(Math.abs(this._mouseDownEvent.pageX-j.pageX),Math.abs(this._mouseDownEvent.pageY-j.pageY))>=this.options.distance)},_mouseDelayMet:function(j){return this.mouseDelayMet},_mouseStart:function(j){},_mouseDrag:function(j){},_mouseStop:function(j){},_mouseCapture:function(j){return true}};c.ui.mouse.defaults={cancel:null,distance:1,delay:0}})(jQuery); \ No newline at end of file

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r13020 - trunk/ui/colorPicker/src/main/templates/org/richfaces.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2009-03-18 21:38:16 -0400 (Wed, 18 Mar 2009) New Revision: 13020 Modified: trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx Log: https://jira.jboss.org/jira/browse/RF-6530 - popup was fixed on the JavaScript level Modified: trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx =================================================================== --- trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-03-18 23:43:02 UTC (rev 13019) +++ trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-03-19 01:38:16 UTC (rev 13020) @@ -4,7 +4,7 @@ xmlns:c=" http://java.sun.com/jsf/core" xmlns:ui=" http://ajax4jsf.org/cdk/ui" xmlns:u=" http://ajax4jsf.org/cdk/u" - xmlns:x=" http://ajax4jsf.org/cdk/x" + xmlns:x=" http://ajax4jsf.org/cdk/x" xmlns:h=" http://ajax4jsf.org/cdk/h" class="org.richfaces.renderkit.html.ColorPickerRenderer" baseclass="org.richfaces.renderkit.ColorPickerRendererBase" @@ -15,27 +15,34 @@ <h:styles>/org/richfaces/renderkit/html/css/colorPicker.xcss</h:styles> <f:resource name="/org/richfaces/renderkit/html/images/arrow.gif" var="arrow" /> <f:resource name="/org/richfaces/renderkit/html/images/rainbow.png" var="rainbow" /> - - <c:object var="showEvent" type="java.lang.String" /> + + <c:object var="showEvent" type="java.lang.String" /> <c:object var="clientIdJquery" type="java.lang.String" /> - <c:object var="colorMode" type="java.lang.String" /> - - <div style="display: none;" id="#{clientId}-colorPickerScript"> - <script type="text/javascript"> - jQuery(document).ready(function(){ - - if(navigator.appName == "Microsoft Internet Explorer" && parseInt(navigator.appVersion) == 4 && navigator.appVersion.indexOf("MSIE 7.0") == -1){ - jQuery('div.rich-colorPicker-color').pngFix(); - } - - <jsp:scriptlet><![CDATA[ + <c:object var="colorMode" type="java.lang.String" /> + <c:object var="value" type="java.lang.String" /> + + <div style="display: none;" id="#{clientId}-colorPickerScript"> + <script type="text/javascript"> + jQuery(document).ready(function(){ + + if(navigator.appName == "Microsoft Internet Explorer" && parseInt(navigator.appVersion) == 4 && navigator.appVersion.indexOf("MSIE 7.0") == -1){ + jQuery('div.rich-colorPicker-color').pngFix(); + } + + <jsp:scriptlet><![CDATA[ Boolean flat = (Boolean) component.getAttributes().get("flat"); - colorMode = (String) component.getAttributes().get("colorMode"); - showEvent = (String) component.getAttributes().get("showEvent"); - if(showEvent.startsWith("on")){ - showEvent = showEvent.substring(2); - } - clientIdJquery = convertToString(clientId); + colorMode = (String) component.getAttributes().get("colorMode"); + showEvent = (String) component.getAttributes().get("showEvent"); + value = (String) component.getAttributes().get("value"); + + if (value == null || value == ""){ + value = "#ffffff"; + } + + if(showEvent.startsWith("on")){ + showEvent = showEvent.substring(2); + } + clientIdJquery = convertToString(clientId); clientIdJquery = clientIdJquery.replace(":", "\\\\:"); colorMode = colorMode.toLowerCase(); @@ -43,14 +50,14 @@ colorMode = pattern.matcher(colorMode).replaceAll(""); boolean disabled = getUtils().isBooleanAttribute(component, "disabled"); - variables.setVariable("disabled",new Boolean(disabled)); + variables.setVariable("disabled",new Boolean(disabled)); ]]></jsp:scriptlet> - - jQuery('\##{clientIdJquery}colorPicker').colorPicker({ - flat: #{component.attributes['flat']}, - color: "#{component.attributes['value']}", - showEvent: "#{showEvent}", - clientId: '\##{clientIdJquery}colorPicker', + + jQuery('\##{clientIdJquery}colorPicker').colorPicker({ + flat: #{component.attributes['flat']}, + color: "#{value}", + showEvent: "#{showEvent}", + clientId: '\##{clientIdJquery}colorPicker', submit: function(e, ui) { switch("#{colorMode}"){ case "hex": @@ -62,10 +69,10 @@ default: jQuery('\##{clientIdJquery}colorPicker input').val(ui.hex); } - } - }); - }); - </script> + } + }); + }); + </script> </div> <span id="#{clientId}colorPicker" class="rich-colorPicker-span" x:passThruWithExclusions="value,name,type,id,styleClass,class,style"> <input readonly="readonly" disabled="#{disabled}" type="text" name="#{clientId}" value="#{this:getInputValue(context, component)}"/> @@ -84,7 +91,7 @@ } ]]> </jsp:scriptlet> - </span> + </span> <div id="#{clientId}colorPicker-popup" class="rich-colorPicker-wrapper"> <div class="rich-colorPicker-ext"> @@ -143,8 +150,8 @@ <label for="hsb-b">B:</label> <input id="#{clientId}-colorPicker-hsb-b" class="rich-colorPicker-colors-input" type="text" maxlength="3" size="2" /> </div> - <button type="button" class="rich-colorPicker-submit" name="submit">Apply</button> + <button type="button" class="rich-colorPicker-submit" name="submit">Apply</button> <button type="button" class="rich-colorPicker-cancel" name="cancel">Cancel</button> </div> </div> -</f:root> +</f:root>

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r13019 - trunk/samples/tree-demo/src/main/java/org/richfaces.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-03-18 19:43:02 -0400 (Wed, 18 Mar 2009) New Revision: 13019 Modified: trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java Log: https://jira.jboss.org/jira/browse/RF-4351 Modified: trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java =================================================================== --- trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java 2009-03-18 23:32:23 UTC (rev 13018) +++ trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java 2009-03-18 23:43:02 UTC (rev 13019) @@ -255,7 +255,7 @@ // Force more than one node to update here: for (int i = 0; i < 5; i++) { - ListRowKey dirtyKey = new ListRowKey(Integer.toString(i)); + ListRowKey dirtyKey = new ListRowKey(null, Integer.toString(i)); tree.addRequestKey(dirtyKey); tree.setRowKey(dirtyKey); ajaxCtx.addComponentToAjaxRender(tree.getParent(), tree.getClientId(fctx)); @@ -288,7 +288,7 @@ public String expand() { if (expandPath != null && expandPath.length() != 0) { try { - tree.queueNodeExpand(new ListRowKey(expandPath)); + tree.queueNodeExpand(new ListRowKey(null, expandPath)); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -406,7 +406,7 @@ String pathToExpand = getPathToExpand(); if (pathToExpand != null && pathToExpand.trim().length() != 0) { try { - ((UITree) getTree()).queueNodeExpand(new ListRowKey(pathToExpand)); + ((UITree) getTree()).queueNodeExpand(new ListRowKey(null, pathToExpand)); } catch (IOException e) { throw new FacesException(e); }

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r13018 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: smukhina Date: 2009-03-18 19:32:23 -0400 (Wed, 18 Mar 2009) New Revision: 13018 Modified: trunk/docs/userguide/en/src/main/docbook/included/suggestionbox.xml Log: https://jira.jboss.org/jira/browse/RF-6422 Typo in documentation - suggestionbox - fixed Modified: trunk/docs/userguide/en/src/main/docbook/included/suggestionbox.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/suggestionbox.xml 2009-03-18 22:27:47 UTC (rev 13017) +++ trunk/docs/userguide/en/src/main/docbook/included/suggestionbox.xml 2009-03-18 23:32:23 UTC (rev 13018) @@ -55,7 +55,7 @@ <h:column> <h:outputText value="#{suggest.text}"/> </h:column> - </rich:suggestionbBox> + </rich:suggestionbox> ... ]]></programlisting> <para>Here is the <code>bean.autocomplete</code> method that returns the

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r13017 - in trunk/ui/tree/src: test/java/org/richfaces/converter and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-03-18 18:27:47 -0400 (Wed, 18 Mar 2009) New Revision: 13017 Modified: trunk/ui/tree/src/main/java/org/richfaces/converter/BaseTreeConverter.java trunk/ui/tree/src/test/java/org/richfaces/converter/BaseTreeConverterTest.java Log: https://jira.jboss.org/jira/browse/RF-4351 Modified: trunk/ui/tree/src/main/java/org/richfaces/converter/BaseTreeConverter.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/converter/BaseTreeConverter.java 2009-03-18 20:13:06 UTC (rev 13016) +++ trunk/ui/tree/src/main/java/org/richfaces/converter/BaseTreeConverter.java 2009-03-18 22:27:47 UTC (rev 13017) @@ -16,7 +16,7 @@ public abstract class BaseTreeConverter implements Converter { - private static final Pattern unescapePattern = Pattern.compile("_(:|_)|_(x[0-9A-Fa-f]{2}|[0-9A-Fa-f]{4})?|(:)"); + private static final Pattern unescapePattern = Pattern.compile("_(:|_)|_(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4})?|(:)"); //private static final Pattern htmlEscapePattern = Pattern.compile(":|_|[^0-9a-zA-Z]"); @@ -47,11 +47,10 @@ sb.append("x"); // _xef break; case 3: - sb.append("0"); // _0fed + sb.append("u0"); // _u0fed break; case 4: - //no padding required - // _fcda + sb.append("u"); // _ufcda break; default: @@ -91,9 +90,7 @@ matcher.appendReplacement(sb, ""); String hex = matcher.group(2); if (hex != null) { - if (hex.charAt(0) == 'x') { - hex = hex.substring(1); - } + hex = hex.substring(1); int h = Integer.parseInt(hex, 16); sb.append((char) h); Modified: trunk/ui/tree/src/test/java/org/richfaces/converter/BaseTreeConverterTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/converter/BaseTreeConverterTest.java 2009-03-18 20:13:06 UTC (rev 13016) +++ trunk/ui/tree/src/test/java/org/richfaces/converter/BaseTreeConverterTest.java 2009-03-18 22:27:47 UTC (rev 13017) @@ -79,11 +79,11 @@ sb.setLength(0); converter.appendToKeyString(sb, "a\u037ec"); - assertEquals("a_037ec:", sb.toString()); + assertEquals("a_u037ec:", sb.toString()); sb.setLength(0); converter.appendToKeyString(sb, "a\ue1acd"); - assertEquals("a_e1acd:", sb.toString()); + assertEquals("a_ue1acd:", sb.toString()); sb.setLength(0); } @@ -126,22 +126,22 @@ assertEquals("\u00a9", split.get(0)); assertEquals("c\u0098ab", split.get(1)); - split = converter.splitKeyString("_0008:a_0009bcd"); + split = converter.splitKeyString("_u0008:a_u0009bcd"); assertEquals(2, split.size()); assertEquals("\u0008", split.get(0)); assertEquals("a\u0009bcd", split.get(1)); - split = converter.splitKeyString("_0028:a_00a9bcd"); + split = converter.splitKeyString("_u0028:a_u00a9bcd"); assertEquals(2, split.size()); assertEquals("\u0028", split.get(0)); assertEquals("a\u00a9bcd", split.get(1)); - split = converter.splitKeyString("_0a28:a_0ea9bcd"); + split = converter.splitKeyString("_u0a28:a_u0ea9bcd"); assertEquals(2, split.size()); assertEquals("\u0a28", split.get(0)); assertEquals("a\u0ea9bcd", split.get(1)); - split = converter.splitKeyString("_9e28:a_f3a9bcd"); + split = converter.splitKeyString("_u9e28:a_uf3a9bcd"); assertEquals(2, split.size()); assertEquals("\u9e28", split.get(0)); assertEquals("a\uf3a9bcd", split.get(1));

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r13016 - in trunk/samples/treeModelDemo/src/main: java/org/richfaces/rf4351 and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-03-18 16:13:06 -0400 (Wed, 18 Mar 2009) New Revision: 13016 Added: trunk/samples/treeModelDemo/src/main/java/org/richfaces/rf4351/ trunk/samples/treeModelDemo/src/main/java/org/richfaces/rf4351/Bean.java trunk/samples/treeModelDemo/src/main/webapp/pages/rf-4351.jsp Modified: trunk/samples/treeModelDemo/src/main/java/org/richfaces/TreeModelBean.java trunk/samples/treeModelDemo/src/main/webapp/WEB-INF/faces-config.xml trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp Log: https://jira.jboss.org/jira/browse/RF-4351 Modified: trunk/samples/treeModelDemo/src/main/java/org/richfaces/TreeModelBean.java =================================================================== --- trunk/samples/treeModelDemo/src/main/java/org/richfaces/TreeModelBean.java 2009-03-18 20:12:27 UTC (rev 13015) +++ trunk/samples/treeModelDemo/src/main/java/org/richfaces/TreeModelBean.java 2009-03-18 20:13:06 UTC (rev 13016) @@ -3,10 +3,14 @@ */ package org.richfaces; +import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import org.richfaces.component.UITree; +import org.richfaces.component.html.HtmlRecursiveTreeNodesAdaptor; import org.richfaces.model.SimpleRecursiveNode; +import org.richfaces.model.StackingTreeModel; /** * @author Nick Belaevski @@ -15,12 +19,44 @@ * */ public class TreeModelBean { + + private HtmlRecursiveTreeNodesAdaptor binding = new MyHtmlRecursiveTreeNodesAdaptor(); + + public HtmlRecursiveTreeNodesAdaptor getBinding() { + return binding; + } + + public void setBinding(HtmlRecursiveTreeNodesAdaptor binding) { + this.binding = binding; + } + public Boolean adviseNodeOpened(UITree tree) { return Boolean.TRUE; } private SimpleRecursiveNode simpleRecursiveNode; + public static class MyHtmlRecursiveTreeNodesAdaptor extends HtmlRecursiveTreeNodesAdaptor { + @Override + public StackingTreeModel getStackingModel() { + StackingTreeModel stackingModel = super.getStackingModel(); + +// Iterator iterator = stackingModel.getModelsIterator(); +// List<StackingTreeModel> list = new ArrayList<StackingTreeModel>(); +// while (iterator.hasNext()) { +// list.add((StackingTreeModel) iterator.next()); +// if (iterator.hasNext()) { +// iterator.remove(); +// } +// } +// +// for (StackingTreeModel stackingTreeModel : list) { +// stackingModel.addStackingModel(stackingTreeModel); +// } + return stackingModel; + } + }; + public TreeModelBean() { simpleRecursiveNode = new SimpleRecursiveNode(null, null); for (int i = 0; i < 5; i++) { Added: trunk/samples/treeModelDemo/src/main/java/org/richfaces/rf4351/Bean.java =================================================================== --- trunk/samples/treeModelDemo/src/main/java/org/richfaces/rf4351/Bean.java (rev 0) +++ trunk/samples/treeModelDemo/src/main/java/org/richfaces/rf4351/Bean.java 2009-03-18 20:13:06 UTC (rev 13016) @@ -0,0 +1,50 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.rf4351; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + */ + +public class Bean { + + private List<String[]> list; + + public List<String[]> getList() { + if (list == null) { + list = new ArrayList<String[]>(); + for (int i = 0; i < 5; i++) { + String[] s = new String[5]; + for (int j = 0; j < s.length; j++) { + s[j] = UUID.randomUUID().toString(); + } + + list.add(s); + } + } + + return list; + } +} Modified: trunk/samples/treeModelDemo/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/samples/treeModelDemo/src/main/webapp/WEB-INF/faces-config.xml 2009-03-18 20:12:27 UTC (rev 13015) +++ trunk/samples/treeModelDemo/src/main/webapp/WEB-INF/faces-config.xml 2009-03-18 20:13:06 UTC (rev 13016) @@ -13,4 +13,9 @@ <managed-bean-class>org.richfaces.Loader</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> + <managed-bean> + <managed-bean-name>rf4351Bean</managed-bean-name> + <managed-bean-class>org.richfaces.rf4351.Bean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> </faces-config> Modified: trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp 2009-03-18 20:12:27 UTC (rev 13015) +++ trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp 2009-03-18 20:13:06 UTC (rev 13016) @@ -63,7 +63,7 @@ </model:treeNodesAdaptor> <model:recursiveTreeNodesAdaptor id="dir" var="dir" - roots="#{project.dirs}" nodes="#{dir.directories}"> + roots="#{project.dirs}" nodes="#{dir.directories}" binding="#{treeModelBean.binding}"> <tree:treeNode> <a4j:commandLink action="#{dir.click}" ajaxSingle="true" value="Immediate " /><br /> <h:commandLink action="#{dir.click}" value="Directory: #{dir.name}" /> Added: trunk/samples/treeModelDemo/src/main/webapp/pages/rf-4351.jsp =================================================================== --- trunk/samples/treeModelDemo/src/main/webapp/pages/rf-4351.jsp (rev 0) +++ trunk/samples/treeModelDemo/src/main/webapp/pages/rf-4351.jsp 2009-03-18 20:13:06 UTC (rev 13016) @@ -0,0 +1,38 @@ +<%@ page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> + +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> + +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/treeModel" prefix="model" %> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/tree" prefix="tree" %> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/drag-drop" prefix="dnd" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> + +<html> + <head> + <title></title> + </head> + <body> + <f:view> + <h:form> + <a4j:outputPanel ajaxRendered="true"> + <h:messages /> + </a4j:outputPanel> + + <tree:tree switchType="ajax" id="tree" rowKeyConverter="org.richfaces.TreeAdaptorIntegerRowKeyConverter"> + <model:treeNodesAdaptor nodes="#{rf4351Bean.list}" var="listElement"> + <tree:treeNode ajaxSingle="true"> + <h:outputText value="Node" /> + </tree:treeNode> + <model:treeNodesAdaptor nodes="#{listElement}" var="s"> + <tree:treeNode ajaxSingle="true"> + <h:outputText value="#{s}" /> + </tree:treeNode> + </model:treeNodesAdaptor> + </model:treeNodesAdaptor> + + </tree:tree> + </h:form> + </f:view> + </body> +</html>

15 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r13015 - in trunk/samples/tree-demo/src/main: java/org/richfaces/rf4351 and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2009-03-18 16:12:27 -0400 (Wed, 18 Mar 2009) New Revision: 13015 Added: trunk/samples/tree-demo/src/main/java/org/richfaces/rf4351/ trunk/samples/tree-demo/src/main/java/org/richfaces/rf4351/Bean.java trunk/samples/tree-demo/src/main/webapp/pages/rf-4351.jsp Modified: trunk/samples/tree-demo/src/main/webapp/WEB-INF/faces-config.xml Log: https://jira.jboss.org/jira/browse/RF-4351 Added: trunk/samples/tree-demo/src/main/java/org/richfaces/rf4351/Bean.java =================================================================== --- trunk/samples/tree-demo/src/main/java/org/richfaces/rf4351/Bean.java (rev 0) +++ trunk/samples/tree-demo/src/main/java/org/richfaces/rf4351/Bean.java 2009-03-18 20:12:27 UTC (rev 13015) @@ -0,0 +1,173 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.rf4351; + +import java.util.Set; +import java.util.TreeSet; + +import org.richfaces.model.TreeNode; +import org.richfaces.model.TreeNodeImpl; + +/** + * @author Nick Belaevski + * @since 3.3.1 + */ + +public class Bean { + + private static final String[] escapedChars = new String[] { + "<", ">", "&", "\"", "'", ":", "_" + }; + + private TreeNode data; + + public TreeNode getData() { + if (data == null) { + data = new TreeNodeImpl(); + + for (int i = 0; i < escapedChars.length; i++) { + TreeNode child = new TreeNodeImpl(); + child.setData("Node " + escapedChars[i]); + data.addChild(escapedChars[i] + " node", child); + + TreeNode grandChild = new TreeNodeImpl(); + grandChild.setData("GrandChild"); + child.addChild("grand & child", grandChild); + } + } + return data; + } + + public static boolean[] checkNameChars() { + Set<Integer> result = new TreeSet<Integer>(); + boolean[] chars = new boolean[0xFFFF + 1]; + + result.add(Character.getType(':')); + chars[':'] = true; + for (char i = 'A'; i <= 'Z'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + result.add(Character.getType('_')); + for (char i = 'a'; i <= 'z'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + + for (char i = '\u00c0'; i <= '\u00d6'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '\u00d8'; i <= '\u00f6'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '\u00f8'; i <= '\u02ff'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '\u0370'; i <= '\u037d'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '\u037f'; i <= '\u1fff'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '\u200c'; i <= '\u200d'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '\u2070'; i <= '\u218f'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '\u2c00'; i <= '\u2fef'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '\u3001'; i <= '\ud7ff'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '\uf900'; i <= '\ufdcf'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '\ufdf0'; i <= '\ufffd'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '-'; i <= '-'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '.'; i <= '.'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '0'; i <= '9'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '\u00b7'; i <= '\u00b7'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '\u0300'; i <= '\u036f'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + for (char i = '\u203f'; i <= '\u2040'; i++) { + result.add(Character.getType(i)); + chars[i] = true; + } + + System.out.println(result); + + return chars; + } + + public static void checkChars(boolean[] skipSet) { + Set<Integer> result = new TreeSet<Integer>(); + for (char c = '\u0000'; c < '\uffff'; c++) { + if (!skipSet[c]) { + result.add(Character.getType(c)); + } + } + System.out.println(result); + } + + public static void main(String[] args) { + boolean[] skipChars = checkNameChars(); + System.out.println("Bean.main()"); + checkChars(skipChars); + } + +// 4] NameStartChar ::= ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | +// [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] | +// [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | +// [#xFDF0-#xFFFD] | [#x10000-#xEFFFF] +// +// [4a] NameChar ::= NameStartChar | "-" | "." | [0-9] | +// #xB7 | [#x0300-#x036F] | [#x203F-#x2040] +} Modified: trunk/samples/tree-demo/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/samples/tree-demo/src/main/webapp/WEB-INF/faces-config.xml 2009-03-18 20:11:48 UTC (rev 13014) +++ trunk/samples/tree-demo/src/main/webapp/WEB-INF/faces-config.xml 2009-03-18 20:12:27 UTC (rev 13015) @@ -36,4 +36,11 @@ <managed-bean-class>org.richfaces.rf4196.Bean</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> </managed-bean> + + <managed-bean> + <managed-bean-name>rf4351</managed-bean-name> + <managed-bean-class>org.richfaces.rf4351.Bean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + </faces-config> Added: trunk/samples/tree-demo/src/main/webapp/pages/rf-4351.jsp =================================================================== --- trunk/samples/tree-demo/src/main/webapp/pages/rf-4351.jsp (rev 0) +++ trunk/samples/tree-demo/src/main/webapp/pages/rf-4351.jsp 2009-03-18 20:12:27 UTC (rev 13015) @@ -0,0 +1,30 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/tree" prefix="rich"%> +<html> + <head> + <title></title> + </head> + <body> + <f:view> + <a4j:status startText="...start..." stopText="stopped" /> + + <h:form> + <rich:tree value="#{rf4351.data}" var="node" switchType="ajax" rowKeyConverter="org.richfaces.TreeRowKeyConverter"> + <rich:treeNode ajaxSingle="true"> + <h:outputText value="#{node}"/><a4j:commandLink ajaxSingle="true" value="link" /> + </rich:treeNode> + </rich:tree> + + No converter: + <rich:tree value="#{rf4351.data}" var="node" switchType="ajax"> + <rich:treeNode ajaxSingle="true"> + <h:outputText value="#{node}"/> + </rich:treeNode> + </rich:tree> + <a4j:log popup="false" /> + </h:form> + </f:view> + </body> +</html>

15 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits March 2009