diff options
| author | wei <> | 2006-10-06 03:46:05 +0000 | 
|---|---|---|
| committer | wei <> | 2006-10-06 03:46:05 +0000 | 
| commit | fe60cc221f922ea362826e2d00431c5df28fe85f (patch) | |
| tree | 9c0449718a862a5b51d62c4ac9697db15c13863f /framework/Web/Javascripts | |
| parent | 9fee2935d91e92235b068632d3608c748ef41bfe (diff) | |
fixed #410 #412
Diffstat (limited to 'framework/Web/Javascripts')
29 files changed, 92 insertions, 75 deletions
| diff --git a/framework/Web/Javascripts/extra/logger.js b/framework/Web/Javascripts/extra/logger.js index d1434361..5771f2f4 100644 --- a/framework/Web/Javascripts/extra/logger.js +++ b/framework/Web/Javascripts/extra/logger.js @@ -195,6 +195,8 @@ LogConsole.prototype = {    commandHistory : [],
    commandIndex : 0,
 +  hidden : true,
 +
    // Methods
    // -------
 @@ -207,7 +209,7 @@ LogConsole.prototype = {      document.body.appendChild(this.logElement)
      Element.hide(this.logElement)
 -		this.logElement.style.position = "absolute"
 +	this.logElement.style.position = "absolute"
      this.logElement.style.left = '0px'
      this.logElement.style.width = '100%'
 @@ -272,8 +274,15 @@ LogConsole.prototype = {      Event.observe(this.inputElement, 'keyup', this.handleInput.bind(this))
      Event.observe(this.inputElement, 'click', function() {this.inputElement.select()}.bind(this))
 +	if(document.all && !window.opera)
 +	{
  		window.setInterval(this.repositionWindow.bind(this), 500)
 -		this.repositionWindow()
 +	}
 +	else
 +	{
 +		this.logElement.style.position="fixed";
 +		this.logElement.style.bottom="0px";
 +	}
      // Listen to the logger....
      Logger.onupdate.addListener(this.logUpdate.bind(this))
 @@ -310,11 +319,15 @@ LogConsole.prototype = {  	show : function() {
  	  Element.show(this.logElement)
  	  this.outputElement.scrollTop = this.outputElement.scrollHeight // Scroll to bottom when toggled
 +	  if(document.all && !window.opera)
 +		  this.repositionWindow();
  	  Cookie.set('ConsoleVisible', 'true')
   	  this.inputElement.select()
 + 	  this.hidden = false;
  	},
  	hide : function() {
 +	  this.hidden = true;
  	  Element.hide(this.logElement)
  	  Cookie.set('ConsoleVisible', 'false')
  	},
 diff --git a/framework/Web/Javascripts/js/compressed/ajax.js b/framework/Web/Javascripts/js/compressed/ajax.js index 4c3a8146..696968c7 100644 --- a/framework/Web/Javascripts/js/compressed/ajax.js +++ b/framework/Web/Javascripts/js/compressed/ajax.js @@ -302,28 +302,28 @@ this.showLabel();}},onTextChanged:function(text)  {this.isSaving=false;this.isEditing=false;this.showLabel();},onTextChangedSuccess:function(sender,parameter)  {this.isSaving=false;this.isEditing=false;if(this.options.AutoHide)  this.showLabel();this.element.innerHTML=parameter==null?this.editField.value:parameter;this.editField.disabled=false;},onTextChangedFailure:function(sender,parameter) -{this.editField.disabled=false;this.isSaving=false;this.isEditing=false;}});Prado.WebUI.TRatingList=Base.extend({selectedIndex:-1,enabled:true,constructor:function(options) +{this.editField.disabled=false;this.isSaving=false;this.isEditing=false;}});Prado.WebUI.TRatingList=Base.extend({selectedIndex:-1,enabled:true,readOnly:false,constructor:function(options)  {var cap=$(options.CaptionID);this.options=Object.extend({caption:cap?cap.innerHTML:''},options||{});Prado.WebUI.TRatingList.register(this);this._init();this.selectedIndex=options.SelectedIndex;this.setRating(this.selectedIndex);},_init:function(options) -{Element.addClassName($(this.options.ListID),this.options.Style);var radios=document.getElementsByName(this.options.ListName);this.radios=new Array();var index=0;for(var i=0;i<radios.length;i++) -{var node=radios[i].parentNode;if(node.tagName.toLowerCase()=='td') -{this.radios.push(radios[i]);Event.observe(node,"mouseover",this.hover.bindEvent(this,index));Event.observe(node,"mouseout",this.recover.bindEvent(this,index));Event.observe(node,"click",this.click.bindEvent(this,index));index++;Element.addClassName(node,"rating");}}},hover:function(ev,index) +{Element.addClassName($(this.options.ListID),this.options.Style);this.radios=new Array();var index=0;for(var i=0;i<this.options.ItemCount;i++) +{var radio=$(this.options.ListID+'_c'+i);var td=radio.parentNode;if(radio&&td.tagName.toLowerCase()=='td') +{this.radios.push(radio);Event.observe(td,"mouseover",this.hover.bindEvent(this,index));Event.observe(td,"mouseout",this.recover.bindEvent(this,index));Event.observe(td,"click",this.click.bindEvent(this,index));index++;Element.addClassName(td,"rating");}}},hover:function(ev,index)  {if(this.enabled==false)return;for(var i=0;i<this.radios.length;i++)  {var action=i<=index?'addClassName':'removeClassName' -Element[action](this.radios[i].parentNode,"rating_hover");} +Element[action](this.radios[i].parentNode,"rating_selected");}  this.setCaption(index);},recover:function(ev,index)  {if(this.enabled==false)return;for(var i=0;i<=index;i++) -Element.removeClassName(this.radios[i].parentNode,"rating_hover");this.setRating(this.selectedIndex);},click:function(ev,index) +Element.removeClassName(this.radios[i].parentNode,"rating_selected");this.setRating(this.selectedIndex);},click:function(ev,index)  {if(this.enabled==false)return;for(var i=0;i<this.radios.length;i++) -this.radios[i].checked=(i==index);this.selectedIndex=index;this.setRating(index);var requestOptions=Object.extend({ID:this.options.ListID+"_c"+index,EventTarget:this.options.ListName+"$c"+index},this.options);var request=new Prado.CallbackRequest(requestOptions.EventTarget,requestOptions);if(request.dispatch()==false) +this.radios[i].checked=(i==index);this.selectedIndex=index;this.setRating(index);var requestOptions=Object.extend({ID:this.options.ListID+"_c"+index,EventTarget:this.options.ListID+"$c"+index},this.options);var request=new Prado.CallbackRequest(requestOptions.EventTarget,requestOptions);if(request.dispatch()==false)  Event.stop(ev);},setRating:function(index)  {for(var i=0;i<this.radios.length;i++) -{var action=i<=index?'addClassName':'removeClassName' +{var node=this.radios[i].parentNode;var action=i>index?'removeClassName':'addClassName'  Element[action](this.radios[i].parentNode,"rating_selected");}  this.setCaption(index);},setCaption:function(index) -{var value=index>-1?this.radios[index].value:this.options.caption;var caption=$(this.options.CaptionID);if(caption)caption.innerHTML=value;$(this.options.ListName).title=value;},setEnabled:function(value) +{var value=index>-1?this.radios[index].value:this.options.caption;var caption=$(this.options.CaptionID);if(caption)caption.innerHTML=value;$(this.options.ListID).title=value;},setEnabled:function(value)  {this.enabled=value;for(var i=0;i<this.radios.length;i++)  {var action=value?'removeClassName':'addClassName' -Element[action](this.radios[i].parentNode,"rating_disabled");Element.removeClassName(this.radios[i].parentNode,"rating_hover");}}},{ratings:{},register:function(rating) +Element[action](this.radios[i].parentNode,"rating_disabled");}}},{ratings:{},register:function(rating)  {Prado.WebUI.TRatingList.ratings[rating.options.ListID]=rating;},setEnabled:function(id,value)  {Prado.WebUI.TRatingList.ratings[id].setEnabled(value);},setRating:function(id,value)  {Prado.WebUI.TRatingList.ratings[id].setRating(value);Prado.WebUI.TRatingList.ratings[id].selectedIndex=value;}});
\ No newline at end of file diff --git a/framework/Web/Javascripts/js/compressed/logger.js b/framework/Web/Javascripts/js/compressed/logger.js index 728c81e5..342b4234 100644 --- a/framework/Web/Javascripts/js/compressed/logger.js +++ b/framework/Web/Javascripts/js/compressed/logger.js @@ -40,7 +40,7 @@ LogEntry=Class.create()  LogEntry.prototype={initialize:function(message,tag){this.message=message  this.tag=tag}}  LogConsole=Class.create() -LogConsole.prototype={commandHistory:[],commandIndex:0,initialize:function(){this.outputCount=0 +LogConsole.prototype={commandHistory:[],commandIndex:0,hidden:true,initialize:function(){this.outputCount=0  this.tagPattern=Cookie.get('tagPattern')||".*"  this.logElement=document.createElement('div')  document.body.appendChild(this.logElement) @@ -93,8 +93,10 @@ this.inputElement.value='Type command here'  this.inputElement.setAttribute('autocomplete','off')  Event.observe(this.inputElement,'keyup',this.handleInput.bind(this))  Event.observe(this.inputElement,'click',function(){this.inputElement.select()}.bind(this)) -window.setInterval(this.repositionWindow.bind(this),500) -this.repositionWindow() +if(document.all&&!window.opera) +{window.setInterval(this.repositionWindow.bind(this),500)} +else +{this.logElement.style.position="fixed";this.logElement.style.bottom="0px";}  Logger.onupdate.addListener(this.logUpdate.bind(this))  Logger.onclear.addListener(this.clear.bind(this))  for(var i=0;i<Logger.logEntries.length;i++){this.logUpdate(Logger.logEntries[i])} @@ -105,8 +107,10 @@ document.body.appendChild(accessElement)  if(Cookie.get('ConsoleVisible')=='true'){this.toggle()}},toggle:function(){if(this.logElement.style.display=='none'){this.show()}  else{this.hide()}},show:function(){Element.show(this.logElement)  this.outputElement.scrollTop=this.outputElement.scrollHeight -Cookie.set('ConsoleVisible','true') -this.inputElement.select()},hide:function(){Element.hide(this.logElement) +if(document.all&&!window.opera) +this.repositionWindow();Cookie.set('ConsoleVisible','true') +this.inputElement.select() +this.hidden=false;},hide:function(){this.hidden=true;Element.hide(this.logElement)  Cookie.set('ConsoleVisible','false')},output:function(message,style){var shouldScroll=(this.outputElement.scrollTop+(2*this.outputElement.clientHeight))>=this.outputElement.scrollHeight  this.outputCount++  style=(style?style+=';':'') diff --git a/framework/Web/Javascripts/js/compressed/prado.js b/framework/Web/Javascripts/js/compressed/prado.js index 376e3a7b..9f8cdb19 100644 --- a/framework/Web/Javascripts/js/compressed/prado.js +++ b/framework/Web/Javascripts/js/compressed/prado.js @@ -392,6 +392,6 @@ window.clipboardData.setData("Text",text);},hover:function(obj)  {obj.parentNode.className="copycode copycode_hover";},out:function(obj)  {obj.parentNode.className="copycode";}});Prado.WebUI.TCheckBoxList=Base.extend({constructor:function(options)  {for(var i=0;i<options.ItemCount;i++) -{var checkBoxOptions=Object.extend({ID:options.ListID+"_c"+i,EventTarget:options.ListName+"$c"+i},options);new Prado.WebUI.TCheckBox(checkBoxOptions);}}});Prado.WebUI.TRadioButtonList=Base.extend({constructor:function(options) +{var checkBoxOptions=Object.extend({ID:options.ListID+"_c"+i,EventTarget:options.ListID+"$c"+i},options);new Prado.WebUI.TCheckBox(checkBoxOptions);}}});Prado.WebUI.TRadioButtonList=Base.extend({constructor:function(options)  {for(var i=0;i<options.ItemCount;i++) -{var radioButtonOptions=Object.extend({ID:options.ListID+"_c"+i,EventTarget:options.ListName+"$c"+i},options);new Prado.WebUI.TRadioButton(radioButtonOptions);}}});
\ No newline at end of file +{var radioButtonOptions=Object.extend({ID:options.ListID+"_c"+i,EventTarget:options.ListID+"$c"+i},options);new Prado.WebUI.TRadioButton(radioButtonOptions);}}});
\ No newline at end of file diff --git a/framework/Web/Javascripts/js/debug/ajax.js b/framework/Web/Javascripts/js/debug/ajax.js index 77df7bc2..ba777546 100644 --- a/framework/Web/Javascripts/js/debug/ajax.js +++ b/framework/Web/Javascripts/js/debug/ajax.js @@ -2614,6 +2614,7 @@ Prado.WebUI.TRatingList = Base.extend(  {
  	selectedIndex : -1,
  	enabled : true,
 +	readOnly : false,
  	constructor : function(options)
  	{
 @@ -2632,20 +2633,20 @@ Prado.WebUI.TRatingList = Base.extend(  	_init: function(options)
  	{
  		Element.addClassName($(this.options.ListID),this.options.Style);
 -		var radios = document.getElementsByName(this.options.ListName);
  		this.radios = new Array();
  		var index=0;
 -		for(var i = 0; i<radios.length; i++)
 +		for(var i = 0; i<this.options.ItemCount; i++)
  		{
 -			var node = radios[i].parentNode;
 -			if(node.tagName.toLowerCase()=='td')
 +			var radio = $(this.options.ListID+'_c'+i);
 +			var td = radio.parentNode;
 +			if(radio && td.tagName.toLowerCase()=='td')
  			{
 -				this.radios.push(radios[i]);
 -				Event.observe(node, "mouseover", this.hover.bindEvent(this,index));
 -				Event.observe(node, "mouseout", this.recover.bindEvent(this,index));
 -				Event.observe(node, "click", this.click.bindEvent(this, index));
 +				this.radios.push(radio);
 +				Event.observe(td, "mouseover", this.hover.bindEvent(this,index));
 +				Event.observe(td, "mouseout", this.recover.bindEvent(this,index));
 +				Event.observe(td, "click", this.click.bindEvent(this, index));
  				index++;
 -				Element.addClassName(node,"rating");
 +				Element.addClassName(td,"rating");
  			}
  		}
  	},
 @@ -2656,7 +2657,7 @@ Prado.WebUI.TRatingList = Base.extend(  		for(var i = 0; i<this.radios.length; i++)
  		{
  			var action = i <= index ? 'addClassName' : 'removeClassName'
 -			Element[action](this.radios[i].parentNode,"rating_hover");
 +			Element[action](this.radios[i].parentNode,"rating_selected");
  		}
  		this.setCaption(index);
  	},
 @@ -2665,7 +2666,7 @@ Prado.WebUI.TRatingList = Base.extend(  	{
  		if(this.enabled==false) return;
  		for(var i = 0; i<=index; i++)
 -			Element.removeClassName(this.radios[i].parentNode, "rating_hover");
 +			Element.removeClassName(this.radios[i].parentNode, "rating_selected");
  		this.setRating(this.selectedIndex);
  	},
 @@ -2679,7 +2680,7 @@ Prado.WebUI.TRatingList = Base.extend(  		var requestOptions = Object.extend(
  		{
  			ID : this.options.ListID+"_c"+index,
 -			EventTarget : this.options.ListName+"$c"+index
 +			EventTarget : this.options.ListID+"$c"+index
  		},this.options);
  		var request = new Prado.CallbackRequest(requestOptions.EventTarget, requestOptions);
  		if(request.dispatch()==false)
 @@ -2688,9 +2689,11 @@ Prado.WebUI.TRatingList = Base.extend(  	setRating: function(index)
  	{
 +
  		for(var i = 0; i<this.radios.length; i++)
  		{
 -			var action = i <= index ? 'addClassName' : 'removeClassName'
 +			var node = this.radios[i].parentNode;
 +			var action = i > index ? 'removeClassName' : 'addClassName'
  			Element[action](this.radios[i].parentNode, "rating_selected");
  		}
  		this.setCaption(index);
 @@ -2701,7 +2704,7 @@ Prado.WebUI.TRatingList = Base.extend(  		var value = index > -1 ? this.radios[index].value : this.options.caption;
  		var caption = $(this.options.CaptionID);
  		if(caption) caption.innerHTML = value;
 -		$(this.options.ListName).title = value;
 +		$(this.options.ListID).title = value;
  	},
  	setEnabled : function(value)
 @@ -2711,7 +2714,6 @@ Prado.WebUI.TRatingList = Base.extend(  		{
  			var action = value ? 'removeClassName' : 'addClassName'
  			Element[action](this.radios[i].parentNode, "rating_disabled");
 -			Element.removeClassName(this.radios[i].parentNode, "rating_hover");
  		}
  	}
  },
 diff --git a/framework/Web/Javascripts/js/debug/logger.js b/framework/Web/Javascripts/js/debug/logger.js index 2a376904..5d465d56 100644 --- a/framework/Web/Javascripts/js/debug/logger.js +++ b/framework/Web/Javascripts/js/debug/logger.js @@ -195,6 +195,8 @@ LogConsole.prototype = {    commandHistory : [],
    commandIndex : 0,
 +  hidden : true,
 +
    // Methods
    // -------
 @@ -207,7 +209,7 @@ LogConsole.prototype = {      document.body.appendChild(this.logElement)
      Element.hide(this.logElement)
 -		this.logElement.style.position = "absolute"
 +	this.logElement.style.position = "absolute"
      this.logElement.style.left = '0px'
      this.logElement.style.width = '100%'
 @@ -272,8 +274,15 @@ LogConsole.prototype = {      Event.observe(this.inputElement, 'keyup', this.handleInput.bind(this))
      Event.observe(this.inputElement, 'click', function() {this.inputElement.select()}.bind(this))
 +	if(document.all && !window.opera)
 +	{
  		window.setInterval(this.repositionWindow.bind(this), 500)
 -		this.repositionWindow()
 +	}
 +	else
 +	{
 +		this.logElement.style.position="fixed";
 +		this.logElement.style.bottom="0px";
 +	}
      // Listen to the logger....
      Logger.onupdate.addListener(this.logUpdate.bind(this))
 @@ -310,11 +319,15 @@ LogConsole.prototype = {  	show : function() {
  	  Element.show(this.logElement)
  	  this.outputElement.scrollTop = this.outputElement.scrollHeight // Scroll to bottom when toggled
 +	  if(document.all && !window.opera)
 +		  this.repositionWindow();
  	  Cookie.set('ConsoleVisible', 'true')
   	  this.inputElement.select()
 + 	  this.hidden = false;
  	},
  	hide : function() {
 +	  this.hidden = true;
  	  Element.hide(this.logElement)
  	  Cookie.set('ConsoleVisible', 'false')
  	},
 diff --git a/framework/Web/Javascripts/js/debug/prado.js b/framework/Web/Javascripts/js/debug/prado.js index 920c2150..aaae6bad 100644 --- a/framework/Web/Javascripts/js/debug/prado.js +++ b/framework/Web/Javascripts/js/debug/prado.js @@ -3504,7 +3504,7 @@ Prado.WebUI.TCheckBoxList = Base.extend(  			var checkBoxOptions = Object.extend(
  			{
  				ID : options.ListID+"_c"+i,
 -				EventTarget : options.ListName+"$c"+i
 +				EventTarget : options.ListID+"$c"+i
  			}, options);
  			new Prado.WebUI.TCheckBox(checkBoxOptions);
  		}
 @@ -3520,7 +3520,7 @@ Prado.WebUI.TRadioButtonList = Base.extend(  			var radioButtonOptions = Object.extend(
  			{
  				ID : options.ListID+"_c"+i,
 -				EventTarget : options.ListName+"$c"+i
 +				EventTarget : options.ListID+"$c"+i
  			}, options);
  			new Prado.WebUI.TRadioButton(radioButtonOptions);
  		}
 diff --git a/framework/Web/Javascripts/prado/controls.js b/framework/Web/Javascripts/prado/controls.js index 0f1bb4d4..c26026ae 100644 --- a/framework/Web/Javascripts/prado/controls.js +++ b/framework/Web/Javascripts/prado/controls.js @@ -252,7 +252,7 @@ Prado.WebUI.TCheckBoxList = Base.extend(  			var checkBoxOptions = Object.extend(
  			{
  				ID : options.ListID+"_c"+i,
 -				EventTarget : options.ListName+"$c"+i
 +				EventTarget : options.ListID+"$c"+i
  			}, options);
  			new Prado.WebUI.TCheckBox(checkBoxOptions);
  		}
 @@ -268,7 +268,7 @@ Prado.WebUI.TRadioButtonList = Base.extend(  			var radioButtonOptions = Object.extend(
  			{
  				ID : options.ListID+"_c"+i,
 -				EventTarget : options.ListName+"$c"+i
 +				EventTarget : options.ListID+"$c"+i
  			}, options);
  			new Prado.WebUI.TRadioButton(radioButtonOptions);
  		}
 diff --git a/framework/Web/Javascripts/ratings/blocks.css b/framework/Web/Javascripts/ratings/blocks.css index 63cb7c2b..5d13a859 100644 --- a/framework/Web/Javascripts/ratings/blocks.css +++ b/framework/Web/Javascripts/ratings/blocks.css @@ -16,7 +16,7 @@  .TRatingList_blocks td.rating
  {
 -	background-image: url(blocks_combined.png);
 +	background-image: url(blocks_combined.gif);
  	background-repeat: no-repeat;
  	cursor: pointer;
  	background-position: 1px 0px;
 @@ -26,15 +26,6 @@  	background-position: 1px -100px;
  }
 -.TRatingList_blocks td.rating_hover
 -{
 -	background-position: 1px -200px;
 -}
 -.TRatingList_blocks td.rating_half
 -{
 -	background-position: 1px -300px;
 -}
 -
  .TRatingList_blocks td.rating_disabled
  {
  	cursor: default !important;
 diff --git a/framework/Web/Javascripts/ratings/blocks.png b/framework/Web/Javascripts/ratings/blocks.pngBinary files differ index 923cda09..0da75b19 100644 --- a/framework/Web/Javascripts/ratings/blocks.png +++ b/framework/Web/Javascripts/ratings/blocks.png diff --git a/framework/Web/Javascripts/ratings/blocks_blank.gif b/framework/Web/Javascripts/ratings/blocks_blank.gifBinary files differ new file mode 100644 index 00000000..c0db17c2 --- /dev/null +++ b/framework/Web/Javascripts/ratings/blocks_blank.gif diff --git a/framework/Web/Javascripts/ratings/blocks_blank.png b/framework/Web/Javascripts/ratings/blocks_blank.pngBinary files differ deleted file mode 100644 index d5004d2d..00000000 --- a/framework/Web/Javascripts/ratings/blocks_blank.png +++ /dev/null diff --git a/framework/Web/Javascripts/ratings/blocks_combined.gif b/framework/Web/Javascripts/ratings/blocks_combined.gifBinary files differ new file mode 100644 index 00000000..04e8f7b8 --- /dev/null +++ b/framework/Web/Javascripts/ratings/blocks_combined.gif diff --git a/framework/Web/Javascripts/ratings/blocks_combined.png b/framework/Web/Javascripts/ratings/blocks_combined.pngBinary files differ deleted file mode 100644 index 57c07672..00000000 --- a/framework/Web/Javascripts/ratings/blocks_combined.png +++ /dev/null diff --git a/framework/Web/Javascripts/ratings/blocks_half.gif b/framework/Web/Javascripts/ratings/blocks_half.gifBinary files differ new file mode 100644 index 00000000..a9e23d7c --- /dev/null +++ b/framework/Web/Javascripts/ratings/blocks_half.gif diff --git a/framework/Web/Javascripts/ratings/blocks_half.png b/framework/Web/Javascripts/ratings/blocks_half.pngBinary files differ deleted file mode 100644 index 344aa207..00000000 --- a/framework/Web/Javascripts/ratings/blocks_half.png +++ /dev/null diff --git a/framework/Web/Javascripts/ratings/blocks_selected.gif b/framework/Web/Javascripts/ratings/blocks_selected.gifBinary files differ new file mode 100644 index 00000000..f743d27e --- /dev/null +++ b/framework/Web/Javascripts/ratings/blocks_selected.gif diff --git a/framework/Web/Javascripts/ratings/blocks_selected.png b/framework/Web/Javascripts/ratings/blocks_selected.pngBinary files differ deleted file mode 100644 index dfdb6889..00000000 --- a/framework/Web/Javascripts/ratings/blocks_selected.png +++ /dev/null diff --git a/framework/Web/Javascripts/ratings/default.css b/framework/Web/Javascripts/ratings/default.css index cf8f7558..aa7913bf 100644 --- a/framework/Web/Javascripts/ratings/default.css +++ b/framework/Web/Javascripts/ratings/default.css @@ -16,25 +16,17 @@  .TRatingList_default td.rating
  {
 -	background-image: url(default_combined.png);
 +	background-image: url(default_combined.gif);
  	background-repeat: no-repeat;
  	cursor: pointer;
  	background-position: 0px 0px;
  }
 +
  .TRatingList_default td.rating_selected
  {
  	background-position: 0px -100px;
  }
 -.TRatingList_default td.rating_hover
 -{
 -	background-position: 0px -200px;
 -}
 -.TRatingList_default td.rating_half
 -{
 -	background-position: 0px -300px;
 -}
 -
  .TRatingList_default td.rating_disabled
  {
  	cursor: default !important;
 diff --git a/framework/Web/Javascripts/ratings/default.png b/framework/Web/Javascripts/ratings/default.pngBinary files differ index f9f380a9..17bc39a1 100644 --- a/framework/Web/Javascripts/ratings/default.png +++ b/framework/Web/Javascripts/ratings/default.png diff --git a/framework/Web/Javascripts/ratings/default_blank.gif b/framework/Web/Javascripts/ratings/default_blank.gifBinary files differ new file mode 100644 index 00000000..0337ad16 --- /dev/null +++ b/framework/Web/Javascripts/ratings/default_blank.gif diff --git a/framework/Web/Javascripts/ratings/default_blank.png b/framework/Web/Javascripts/ratings/default_blank.pngBinary files differ deleted file mode 100644 index f857ff17..00000000 --- a/framework/Web/Javascripts/ratings/default_blank.png +++ /dev/null diff --git a/framework/Web/Javascripts/ratings/default_combined.gif b/framework/Web/Javascripts/ratings/default_combined.gifBinary files differ new file mode 100644 index 00000000..fe02b446 --- /dev/null +++ b/framework/Web/Javascripts/ratings/default_combined.gif diff --git a/framework/Web/Javascripts/ratings/default_combined.png b/framework/Web/Javascripts/ratings/default_combined.pngBinary files differ deleted file mode 100644 index 1756f912..00000000 --- a/framework/Web/Javascripts/ratings/default_combined.png +++ /dev/null diff --git a/framework/Web/Javascripts/ratings/default_half.gif b/framework/Web/Javascripts/ratings/default_half.gifBinary files differ new file mode 100644 index 00000000..ed214acd --- /dev/null +++ b/framework/Web/Javascripts/ratings/default_half.gif diff --git a/framework/Web/Javascripts/ratings/default_half.png b/framework/Web/Javascripts/ratings/default_half.pngBinary files differ deleted file mode 100644 index 6c826054..00000000 --- a/framework/Web/Javascripts/ratings/default_half.png +++ /dev/null diff --git a/framework/Web/Javascripts/ratings/default_selected.gif b/framework/Web/Javascripts/ratings/default_selected.gifBinary files differ new file mode 100644 index 00000000..98704fad --- /dev/null +++ b/framework/Web/Javascripts/ratings/default_selected.gif diff --git a/framework/Web/Javascripts/ratings/default_selected.png b/framework/Web/Javascripts/ratings/default_selected.pngBinary files differ deleted file mode 100644 index e40d6b04..00000000 --- a/framework/Web/Javascripts/ratings/default_selected.png +++ /dev/null diff --git a/framework/Web/Javascripts/ratings/ratings.js b/framework/Web/Javascripts/ratings/ratings.js index 04ebd31d..9299d8d8 100644 --- a/framework/Web/Javascripts/ratings/ratings.js +++ b/framework/Web/Javascripts/ratings/ratings.js @@ -2,6 +2,7 @@ Prado.WebUI.TRatingList = Base.extend(  {
  	selectedIndex : -1,
  	enabled : true,
 +	readOnly : false,
  	constructor : function(options)
  	{
 @@ -20,20 +21,20 @@ Prado.WebUI.TRatingList = Base.extend(  	_init: function(options)
  	{
  		Element.addClassName($(this.options.ListID),this.options.Style);
 -		var radios = document.getElementsByName(this.options.ListName);
  		this.radios = new Array();
  		var index=0;
 -		for(var i = 0; i<radios.length; i++)
 +		for(var i = 0; i<this.options.ItemCount; i++)
  		{
 -			var node = radios[i].parentNode;
 -			if(node.tagName.toLowerCase()=='td')
 +			var radio = $(this.options.ListID+'_c'+i);
 +			var td = radio.parentNode;
 +			if(radio && td.tagName.toLowerCase()=='td')
  			{
 -				this.radios.push(radios[i]);
 -				Event.observe(node, "mouseover", this.hover.bindEvent(this,index));
 -				Event.observe(node, "mouseout", this.recover.bindEvent(this,index));
 -				Event.observe(node, "click", this.click.bindEvent(this, index));
 +				this.radios.push(radio);
 +				Event.observe(td, "mouseover", this.hover.bindEvent(this,index));
 +				Event.observe(td, "mouseout", this.recover.bindEvent(this,index));
 +				Event.observe(td, "click", this.click.bindEvent(this, index));
  				index++;
 -				Element.addClassName(node,"rating");
 +				Element.addClassName(td,"rating");
  			}
  		}
  	},
 @@ -44,7 +45,7 @@ Prado.WebUI.TRatingList = Base.extend(  		for(var i = 0; i<this.radios.length; i++)
  		{
  			var action = i <= index ? 'addClassName' : 'removeClassName'
 -			Element[action](this.radios[i].parentNode,"rating_hover");
 +			Element[action](this.radios[i].parentNode,"rating_selected");
  		}
  		this.setCaption(index);
  	},
 @@ -53,7 +54,7 @@ Prado.WebUI.TRatingList = Base.extend(  	{
  		if(this.enabled==false) return;
  		for(var i = 0; i<=index; i++)
 -			Element.removeClassName(this.radios[i].parentNode, "rating_hover");
 +			Element.removeClassName(this.radios[i].parentNode, "rating_selected");
  		this.setRating(this.selectedIndex);
  	},
 @@ -67,7 +68,7 @@ Prado.WebUI.TRatingList = Base.extend(  		var requestOptions = Object.extend(
  		{
  			ID : this.options.ListID+"_c"+index,
 -			EventTarget : this.options.ListName+"$c"+index
 +			EventTarget : this.options.ListID+"$c"+index
  		},this.options);
  		var request = new Prado.CallbackRequest(requestOptions.EventTarget, requestOptions);
  		if(request.dispatch()==false)
 @@ -76,9 +77,11 @@ Prado.WebUI.TRatingList = Base.extend(  	setRating: function(index)
  	{
 +
  		for(var i = 0; i<this.radios.length; i++)
  		{
 -			var action = i <= index ? 'addClassName' : 'removeClassName'
 +			var node = this.radios[i].parentNode;
 +			var action = i > index ? 'removeClassName' : 'addClassName'
  			Element[action](this.radios[i].parentNode, "rating_selected");
  		}
  		this.setCaption(index);
 @@ -89,7 +92,7 @@ Prado.WebUI.TRatingList = Base.extend(  		var value = index > -1 ? this.radios[index].value : this.options.caption;
  		var caption = $(this.options.CaptionID);
  		if(caption) caption.innerHTML = value;
 -		$(this.options.ListName).title = value;
 +		$(this.options.ListID).title = value;
  	},
  	setEnabled : function(value)
 @@ -99,7 +102,6 @@ Prado.WebUI.TRatingList = Base.extend(  		{
  			var action = value ? 'removeClassName' : 'addClassName'
  			Element[action](this.radios[i].parentNode, "rating_disabled");
 -			Element.removeClassName(this.radios[i].parentNode, "rating_hover");
  		}
  	}
  },
 | 
