Changeset 5945

Show
Ignore:
Timestamp:
10/06/08 09:34:43 (1 year ago)
Author:
uta
Message:

2008/10/06 sync

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • rubricks_core/trunk/public/javascripts/rubricks_common.js

    r5886 r5945  
    287287this.change_icon(); 
    288288this.change_button(); 
     289}}; 
     290 
     291rubricks.common.DateUtils={parse_date:function(_1){ 
     292try{ 
     293var yy,mm,dd,_5; 
     294_5=_1.split("/"); 
     295if(_5[0].length==4){ 
     296yy=parseInt(_5[0],"10"); 
     297mm=parseInt(_5[1],"10"); 
     298dd=parseInt(_5[2],"10"); 
     299}else{ 
     300yy=parseInt(_5[2],"10"); 
     301mm=parseInt(_5[0],"10"); 
     302dd=parseInt(_5[1],"10"); 
     303} 
     304if(yy<1000||yy>3000||mm<0||mm>12||dd<0||dd>31){ 
     305return null; 
     306}else{ 
     307return new Date(yy,mm-1,dd); 
     308} 
     309} 
     310catch(e){ 
     311return null; 
     312} 
    289313}}; 
    290314 
  • rubricks_core/trunk/public/javascripts/spinelz/autoKana.js

    r5920 r5945  
    108108return ((c>=12353&&c<=12435)||c==12445||c==12446); 
    109109},_removeString:function(_16){ 
    110 if(_16.match(this.ignoreString)){ 
     110if(_16.indexOf(this.ignoreString)>=0){ 
    111111return _16.replace(this.ignoreString,""); 
    112112}else{ 
  • rubricks_core/trunk/public/javascripts/spinelz/calendar.js

    r5909 r5945  
    11061106days--; 
    11071107} 
    1108 if((_152>=_14d&&_152<=_14e)||(_154>=_14d&&_154<=_14e)){ 
     1108if((_14d<=_152&&_152<=_14e)||(_14d<=_154&&_154<=_14e)||((_152<=_14d)&&(_14e<=_154))){ 
    11091109if(!_14c.sameMonth(_151)){ 
    11101110_151=_14c; 
     
    11651165var _16c=new Date(date.getTime()); 
    11661166while(_16c.days()<=_167.days()){ 
    1167 if(_16c.getMonth()==_161.getMonth()){ 
     1167if((_16c.getFullYear()==_161.getFullYear())&&(_16c.getMonth()==_161.getMonth())){ 
    11681168var _16d=this.getCellPosition(_16c.getDate()); 
    11691169if(_16d){ 
  • rubricks_core/trunk/public/javascripts/spinelz/spinelz_for_rubricks.js

    r5920 r5945  
    229229return ((c>=12353&&c<=12435)||c==12445||c==12446); 
    230230},_removeString:function(_16){ 
    231 if(_16.match(this.ignoreString)){ 
     231if(_16.indexOf(this.ignoreString)>=0){ 
    232232return _16.replace(this.ignoreString,""); 
    233233}else{ 
     
    15841584days--; 
    15851585} 
    1586 if((_152>=_14d&&_152<=_14e)||(_154>=_14d&&_154<=_14e)){ 
     1586if((_14d<=_152&&_152<=_14e)||(_14d<=_154&&_154<=_14e)||((_152<=_14d)&&(_14e<=_154))){ 
    15871587if(!_14c.sameMonth(_151)){ 
    15881588_151=_14c; 
     
    16431643var _16c=new Date(date.getTime()); 
    16441644while(_16c.days()<=_167.days()){ 
    1645 if(_16c.getMonth()==_161.getMonth()){ 
     1645if((_16c.getFullYear()==_161.getFullYear())&&(_16c.getMonth()==_161.getMonth())){ 
    16461646var _16d=this.getCellPosition(_16c.getDate()); 
    16471647if(_16d){ 
     
    46104610}.bind(this)); 
    46114611},build:function(){ 
    4612 var _8=(UserAgent.isIE7())?" style='height: 90%;'":""; 
     4612var _8=(UserAgent.isIE7())?" style='height: auto;'":""; 
    46134613var _9="<div id='"+this.tabContainerId+"' class='"+this.classNames["tabContainer"]+"'"+_8+">"; 
    46144614var _a="<div id='"+this.panelContainerId+"' class='"+this.classNames["panelContainer"]+"'>"; 
  • rubricks_core/trunk/public/javascripts/spinelz/tabBox.js

    r5920 r5945  
    7777}.bind(this)); 
    7878},build:function(){ 
    79 var _8=(UserAgent.isIE7())?" style='height: 90%;'":""; 
     79var _8=(UserAgent.isIE7())?" style='height: auto;'":""; 
    8080var _9="<div id='"+this.tabContainerId+"' class='"+this.classNames["tabContainer"]+"'"+_8+">"; 
    8181var _a="<div id='"+this.panelContainerId+"' class='"+this.classNames["panelContainer"]+"'>"; 
  • rubricks_core/trunk/public/javascripts/spinelz_lib/spinelz_util.js

    r5920 r5945  
    144144SelectElement.destroyAll(_2f); 
    145145},getSelectedOptions:function(_30){ 
    146 SelectElement.getSelelcted(_30); 
     146return SelectElement.getSelected(_30); 
    147147},check:function(_31,id){ 
    148148_31.each(function(_33){ 
  • rubricks_core/trunk/public/javascripts/spinelz_lib/spinelz_util_for_rubricks.js

    r5920 r5945  
    48104810SelectElement.destroyAll(_2f); 
    48114811},getSelectedOptions:function(_30){ 
    4812 SelectElement.getSelelcted(_30); 
     4812return SelectElement.getSelected(_30); 
    48134813},check:function(_31,id){ 
    48144814_31.each(function(_33){ 
  • rubricks_core/trunk/public/javascripts/src_spinelz/autoKana.js

    r5920 r5945  
    165165  }, 
    166166  _removeString: function(new_input) { 
    167     if(new_input.match(this.ignoreString)) { 
     167    if(new_input.indexOf(this.ignoreString) >= 0) { 
    168168      return new_input.replace(this.ignoreString, ''); 
    169169    } else { 
  • rubricks_core/trunk/public/javascripts/src_spinelz/calendar.js

    r5909 r5945  
    15191519        if (schedule.finish.hour == 0 && schedule.finish.min == 0) days--; 
    15201520   
    1521         if ((start >= calStart && start <= calFinish) || (finish >= calStart && finish <= calFinish)) { 
     1521        if ((calStart <= start && start <= calFinish) || 
     1522          (calStart <= finish && finish <= calFinish) || 
     1523          ((start <= calStart) && (calFinish <= finish))) { 
    15221524          if (!calStartDate.sameMonth(startDate)) startDate = calStartDate; 
    15231525          self.setSchedule(schedule, holders, distance, days); 
     
    15821584      var cellDate = new Date(date.getTime()); 
    15831585      while (cellDate.days() <= finishDate.days()) { 
    1584         if (cellDate.getMonth() == targetDate.getMonth()) { 
     1586        if ((cellDate.getFullYear() == targetDate.getFullYear()) && (cellDate.getMonth() == targetDate.getMonth())) { 
    15851587          var cellPosition = this.getCellPosition(cellDate.getDate()); 
    15861588          if (cellPosition) { 
  • rubricks_core/trunk/public/javascripts/src_spinelz/tabBox.js

    r5920 r5945  
    147147   
    148148  build: function() { 
    149     var style = (UserAgent.isIE7()) ? " style='height: 90%;'" : ""; 
     149    var style = (UserAgent.isIE7()) ? " style='height: auto;'" : ""; 
    150150    var tabContainer = 
    151151      "<div id='" + this.tabContainerId + "' class='" + this.classNames['tabContainer'] + "'" + style + ">"; 
  • rubricks_core/trunk/public/javascripts/src_spinelz_lib/spinelz_util.js

    r5920 r5945  
    195195 
    196196  getSelectedOptions: function(element) { 
    197     SelectElement.getSelelcted(element); 
     197    return SelectElement.getSelected(element); 
    198198  }, 
    199199 
  • rubricks_core/trunk/themes/asteriksorange/stylesheets/asteriksorange.css

    r5897 r5945  
    317317  background-position:          top left; 
    318318  height:                       30px; 
     319  position:                     relative; 
    319320  z-index:                      5; 
    320321} 
  • rubricks_core/trunk/themes/rubrickswhite/stylesheets/rubrickswhite.css

    r5897 r5945  
    319319  font-size:                    1px; 
    320320  height:                       30px; 
     321  position:                     relative; 
    321322} 
    322323.rubricks_detail_header_inner {