Changeset 5945
- Timestamp:
- 10/06/08 09:34:43 (1 year ago)
- Files:
-
- rubricks_core/trunk/public/javascripts/rubricks_common.js (modified) (1 diff)
- rubricks_core/trunk/public/javascripts/spinelz/autoKana.js (modified) (1 diff)
- rubricks_core/trunk/public/javascripts/spinelz/calendar.js (modified) (2 diffs)
- rubricks_core/trunk/public/javascripts/spinelz/spinelz_for_rubricks.js (modified) (4 diffs)
- rubricks_core/trunk/public/javascripts/spinelz/tabBox.js (modified) (1 diff)
- rubricks_core/trunk/public/javascripts/spinelz_lib/spinelz_util.js (modified) (1 diff)
- rubricks_core/trunk/public/javascripts/spinelz_lib/spinelz_util_for_rubricks.js (modified) (1 diff)
- rubricks_core/trunk/public/javascripts/src_rubricks_common_date_utils.js (added)
- rubricks_core/trunk/public/javascripts/src_spinelz/autoKana.js (modified) (1 diff)
- rubricks_core/trunk/public/javascripts/src_spinelz/calendar.js (modified) (2 diffs)
- rubricks_core/trunk/public/javascripts/src_spinelz/tabBox.js (modified) (1 diff)
- rubricks_core/trunk/public/javascripts/src_spinelz_lib/spinelz_util.js (modified) (1 diff)
- rubricks_core/trunk/themes/asteriksorange/stylesheets/asteriksorange.css (modified) (1 diff)
- rubricks_core/trunk/themes/rubrickswhite/stylesheets/rubrickswhite.css (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
rubricks_core/trunk/public/javascripts/rubricks_common.js
r5886 r5945 287 287 this.change_icon(); 288 288 this.change_button(); 289 }}; 290 291 rubricks.common.DateUtils={parse_date:function(_1){ 292 try{ 293 var yy,mm,dd,_5; 294 _5=_1.split("/"); 295 if(_5[0].length==4){ 296 yy=parseInt(_5[0],"10"); 297 mm=parseInt(_5[1],"10"); 298 dd=parseInt(_5[2],"10"); 299 }else{ 300 yy=parseInt(_5[2],"10"); 301 mm=parseInt(_5[0],"10"); 302 dd=parseInt(_5[1],"10"); 303 } 304 if(yy<1000||yy>3000||mm<0||mm>12||dd<0||dd>31){ 305 return null; 306 }else{ 307 return new Date(yy,mm-1,dd); 308 } 309 } 310 catch(e){ 311 return null; 312 } 289 313 }}; 290 314 rubricks_core/trunk/public/javascripts/spinelz/autoKana.js
r5920 r5945 108 108 return ((c>=12353&&c<=12435)||c==12445||c==12446); 109 109 },_removeString:function(_16){ 110 if(_16. match(this.ignoreString)){110 if(_16.indexOf(this.ignoreString)>=0){ 111 111 return _16.replace(this.ignoreString,""); 112 112 }else{ rubricks_core/trunk/public/javascripts/spinelz/calendar.js
r5909 r5945 1106 1106 days--; 1107 1107 } 1108 if((_1 52>=_14d&&_152<=_14e)||(_154>=_14d&&_154<=_14e)){1108 if((_14d<=_152&&_152<=_14e)||(_14d<=_154&&_154<=_14e)||((_152<=_14d)&&(_14e<=_154))){ 1109 1109 if(!_14c.sameMonth(_151)){ 1110 1110 _151=_14c; … … 1165 1165 var _16c=new Date(date.getTime()); 1166 1166 while(_16c.days()<=_167.days()){ 1167 if( _16c.getMonth()==_161.getMonth()){1167 if((_16c.getFullYear()==_161.getFullYear())&&(_16c.getMonth()==_161.getMonth())){ 1168 1168 var _16d=this.getCellPosition(_16c.getDate()); 1169 1169 if(_16d){ rubricks_core/trunk/public/javascripts/spinelz/spinelz_for_rubricks.js
r5920 r5945 229 229 return ((c>=12353&&c<=12435)||c==12445||c==12446); 230 230 },_removeString:function(_16){ 231 if(_16. match(this.ignoreString)){231 if(_16.indexOf(this.ignoreString)>=0){ 232 232 return _16.replace(this.ignoreString,""); 233 233 }else{ … … 1584 1584 days--; 1585 1585 } 1586 if((_1 52>=_14d&&_152<=_14e)||(_154>=_14d&&_154<=_14e)){1586 if((_14d<=_152&&_152<=_14e)||(_14d<=_154&&_154<=_14e)||((_152<=_14d)&&(_14e<=_154))){ 1587 1587 if(!_14c.sameMonth(_151)){ 1588 1588 _151=_14c; … … 1643 1643 var _16c=new Date(date.getTime()); 1644 1644 while(_16c.days()<=_167.days()){ 1645 if( _16c.getMonth()==_161.getMonth()){1645 if((_16c.getFullYear()==_161.getFullYear())&&(_16c.getMonth()==_161.getMonth())){ 1646 1646 var _16d=this.getCellPosition(_16c.getDate()); 1647 1647 if(_16d){ … … 4610 4610 }.bind(this)); 4611 4611 },build:function(){ 4612 var _8=(UserAgent.isIE7())?" style='height: 90%;'":"";4612 var _8=(UserAgent.isIE7())?" style='height: auto;'":""; 4613 4613 var _9="<div id='"+this.tabContainerId+"' class='"+this.classNames["tabContainer"]+"'"+_8+">"; 4614 4614 var _a="<div id='"+this.panelContainerId+"' class='"+this.classNames["panelContainer"]+"'>"; rubricks_core/trunk/public/javascripts/spinelz/tabBox.js
r5920 r5945 77 77 }.bind(this)); 78 78 },build:function(){ 79 var _8=(UserAgent.isIE7())?" style='height: 90%;'":"";79 var _8=(UserAgent.isIE7())?" style='height: auto;'":""; 80 80 var _9="<div id='"+this.tabContainerId+"' class='"+this.classNames["tabContainer"]+"'"+_8+">"; 81 81 var _a="<div id='"+this.panelContainerId+"' class='"+this.classNames["panelContainer"]+"'>"; rubricks_core/trunk/public/javascripts/spinelz_lib/spinelz_util.js
r5920 r5945 144 144 SelectElement.destroyAll(_2f); 145 145 },getSelectedOptions:function(_30){ 146 SelectElement.getSelelcted(_30);146 return SelectElement.getSelected(_30); 147 147 },check:function(_31,id){ 148 148 _31.each(function(_33){ rubricks_core/trunk/public/javascripts/spinelz_lib/spinelz_util_for_rubricks.js
r5920 r5945 4810 4810 SelectElement.destroyAll(_2f); 4811 4811 },getSelectedOptions:function(_30){ 4812 SelectElement.getSelelcted(_30);4812 return SelectElement.getSelected(_30); 4813 4813 },check:function(_31,id){ 4814 4814 _31.each(function(_33){ rubricks_core/trunk/public/javascripts/src_spinelz/autoKana.js
r5920 r5945 165 165 }, 166 166 _removeString: function(new_input) { 167 if(new_input. match(this.ignoreString)) {167 if(new_input.indexOf(this.ignoreString) >= 0) { 168 168 return new_input.replace(this.ignoreString, ''); 169 169 } else { rubricks_core/trunk/public/javascripts/src_spinelz/calendar.js
r5909 r5945 1519 1519 if (schedule.finish.hour == 0 && schedule.finish.min == 0) days--; 1520 1520 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))) { 1522 1524 if (!calStartDate.sameMonth(startDate)) startDate = calStartDate; 1523 1525 self.setSchedule(schedule, holders, distance, days); … … 1582 1584 var cellDate = new Date(date.getTime()); 1583 1585 while (cellDate.days() <= finishDate.days()) { 1584 if ( cellDate.getMonth() == targetDate.getMonth()) {1586 if ((cellDate.getFullYear() == targetDate.getFullYear()) && (cellDate.getMonth() == targetDate.getMonth())) { 1585 1587 var cellPosition = this.getCellPosition(cellDate.getDate()); 1586 1588 if (cellPosition) { rubricks_core/trunk/public/javascripts/src_spinelz/tabBox.js
r5920 r5945 147 147 148 148 build: function() { 149 var style = (UserAgent.isIE7()) ? " style='height: 90%;'" : "";149 var style = (UserAgent.isIE7()) ? " style='height: auto;'" : ""; 150 150 var tabContainer = 151 151 "<div id='" + this.tabContainerId + "' class='" + this.classNames['tabContainer'] + "'" + style + ">"; rubricks_core/trunk/public/javascripts/src_spinelz_lib/spinelz_util.js
r5920 r5945 195 195 196 196 getSelectedOptions: function(element) { 197 SelectElement.getSelelcted(element);197 return SelectElement.getSelected(element); 198 198 }, 199 199 rubricks_core/trunk/themes/asteriksorange/stylesheets/asteriksorange.css
r5897 r5945 317 317 background-position: top left; 318 318 height: 30px; 319 position: relative; 319 320 z-index: 5; 320 321 } rubricks_core/trunk/themes/rubrickswhite/stylesheets/rubrickswhite.css
r5897 r5945 319 319 font-size: 1px; 320 320 height: 30px; 321 position: relative; 321 322 } 322 323 .rubricks_detail_header_inner {
