Author: abelevich Date: 2010-10-04 11:00:02 -0400 (Mon, 04 Oct 2010) New Revision: 19427 Modified: branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js Log: refactor inplace class Modified: branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js =================================================================== --- branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js 2010-10-04 14:39:19 UTC (rev 19426) +++ branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js 2010-10-04 15:00:02 UTC (rev 19427) @@ -1,3 +1,4 @@ +// TODO: remove when these functions will be moved to the RichFaces.Event <!-- $.extend(RichFaces.Event, { bindScrollEventHandlers: function(element, handler, component) { var elements = []; @@ -17,8 +18,8 @@ RichFaces.Event.unbind(elements, "scroll"+component.getNamespace()); } }); +// --> - (function ($, rf) { rf.ui = rf.ui || {}; Modified: branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js =================================================================== --- branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2010-10-04 14:39:19 UTC (rev 19426) +++ branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2010-10-04 15:00:02 UTC (rev 19427) @@ -1,209 +1,8 @@ -// TODO: remove when these functions will be moved to the RichFaces.Event - -/* -$.extend(RichFaces.Event, { - bindScrollEventHandlers: function(element, handler, component) { - var elements = []; - element = RichFaces.getDomElement(element).parentNode; - while (element && element!=window.document.body) - { - if (element.offsetWidth!=element.scrollWidth || element.offsetHeight!=element.scrollHeight) - { - elements.push(element); - RichFaces.Event.bind(element, "scroll"+component.getNamespace(), handler, component); - } - element = element.parentNode; - } - return elements; - }, - unbindScrollEventHandlers: function(elements, component) { - RichFaces.Event.unbind(elements, "scroll"+component.getNamespace()); - } -}); - (function ($, rf) { rf.ui = rf.ui || {}; rf.ui.InplaceInput = function(id, options) { - - $super.constructor.call(this, id); - this.attachToDom(id); - - this.namespace = this.getNamespace() || "." + rf.Event.createNamespace(this.getName(), this.id); - - this.editEvent = options.editEvent; - this.noneCss = options.noneCss; - this.changedCss = options.changedCss; - this.showControls = options.showControls; - this.defaultLabel = options.defaultLabel; - - this.element = $(document.getElementById(id)); - this.editContainer = $(document.getElementById(options.editContainer)); - this.input = $(document.getElementById(options.input)); - this.label = $(document.getElementById(options.label)); - this.focusElement = $(document.getElementById(options.focusElement)); - - var label = this.label.text(); - var inputLabel = this.input.val(); - - this.initialValue = (label == inputLabel) ? label : ""; - - this.element.bind(this.editEvent, $.proxy(this.__editHandler, this)); - this.input.bind("focus", $.proxy(this.__editHandler, this)); - this.input.bind("change", $.proxy(this.__changeHandler, this)); - this.input.bind("blur", $.proxy(this.__blurHandler, this)); - this.input.bind("keydown", $.proxy(this.__keydownHandler, this)); - - if(this.showControls) { - this.okbtn = $(document.getElementById(options.okbtn)); - this.cancelbtn = $(document.getElementById(options.cancelbtn)); - this.okbtn.bind("mousedown", $.proxy(this.__saveBtnHandler, this)); - this.cancelbtn.bind("mousedown", $.proxy(this.__cancelBtnHandler, this)); - } - }; - - // Extend component class and add protected methods from parent class to our container - rf.BaseComponent.extend(rf.ui.InplaceInput); - - // define super class link - var $super = rf.ui.InplaceInput.$super; - - $.extend(rf.ui.InplaceInput.prototype, ( function () { - - var isSaved = false; - var isValueChanged = false; - - - return { - name : "inplaceInput", - - getName: function() { - return this.name; - }, - - getNamespace: function () { - return this.namespace; - }, - - edit: function() { - isSaved = false; - this.__show(); - this.input.focus(); - }, - - save: function() { - var inputValue = this.input.val(); - if(inputValue.length > 0) { - this.label.text(inputValue); - isValueChanged = true; - } else { - this.label.text(this.defaultLabel); - isValueChanged = false; - } - - if(inputValue != this.initialValue) { - this.element.addClass(this.changedCss); - } else { - this.element.removeClass(this.changedCss); - } - isSaved = true; - this.__hide(); - }, - - cancel: function() { - var text = ""; - if(isValueChanged) { - text = this.label.text(); - } - this.input.val(text); - isSaved = true; - this.__hide(); - this.element.focus(); - }, - - setValue: function (value) { - this.input.val(value); - this.save(); - }, - - getValue: function() { - return this.input.val(); - }, - - __saveBtnHandler: function(e) { - this.save(); - return false; - }, - - __cancelBtnHandler: function(e) { - this.cancel(); - return false; - }, - - __editHandler: function(e) { - this.input.unbind("focus", this.__editHandler); - this.edit(); - this.input.bind("focus", $.proxy(this.__editHandler, this)); - }, - - __changeHandler: function(e) { - if(!isSaved) { - this.save(); - } - }, - - __blurHandler: function(e) { - if(!isSaved) { - this.save(); - } - return false; - }, - - __scrollHandler: function(e) { - this.cancel(); - }, - - __keydownHandler: function(e) { - switch(e.keyCode) { - case 27: - this.cancel(); - break; - case 13: - this.save(); - return false; - } - - }, - - __show: function() { - this.scrollElements = rf.Event.bindScrollEventHandlers(this.id, this.__scrollHandler, this); - this.editContainer.removeClass(this.noneCss); - }, - - __hide: function() { - rf.Event.unbindScrollEventHandlers(this.scrollElements, this); - this.scrollElements = null; - this.editContainer.addClass(this.noneCss); - this.focusElement.focus(); - }, - - destroy: function () { - //TODO: unbind handlers - $super.destroy.call(this); - } - } - })()); - -})(jQuery, window.RichFaces); - -*/ - -(function ($, rf) { - - rf.ui = rf.ui || {}; - - rf.ui.InplaceInput = function(id, options) { $super.constructor.call(this, id, options); this.input = $(document.getElementById(options.input));