@@ -75,8 +75,8 @@ dumo_to: 将选择的结果dump到指定id的input字段 accessor: 控件的可访问属性，如果设置为readonly则只读，不可修改 --> - <div jpc="dcalendar" gray="2008-07-03;2008-07-10~2008-07-17;2008-08-04~2008-08-20" available="2008-08-04~2008-08-20" status="{'status1': {'period':'2008-08-07~2008-08-10', 'color':'red'}, 'status2':{'period':'2008-08-09～2008-08-11', 'color':'green', 'accessor':'false'}}" dump_to="dcid0_dump"></div> - <input type="hidden" name="dcid0_dump" value="" id="dcid0_dump" /> + <div jpc="dcalendar" gray="2008-07-03;2008-07-10~2008-07-17;2008-08-04~2008-08-20" available="2008-08-04~2008-09-20" status="{'status1': {'period':'2008-08-07~2008-08-10', 'color':'red'}, 'status2':{'period':'2008-08-09～2008-08-11', 'color':'green', 'accessor':'false'}}" dump_to="dcid0_dump"></div> + <input type="text" size="100" name="dcid0_dump" value="" id="dcid0_dump" /> <br><br><br> <div jpc="dcalendar" gray="2008-08-04~2009-01-10" status="{'status1': {'period': '2008-08-17~2008-08-20', 'color': 'orange'}}" accessor="readonly"></div> </div> examples/dcalendar.html @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>currentDocument</key> - <string>examples/dev.html</string> + <string>examples/dcalendar.html</string> <key>documents</key> <array> <dict> @@ -26,28 +26,14 @@ <key>caret</key> <dict> <key>column</key> - <integer>13</integer> + <integer>43</integer> <key>line</key> - <integer>18</integer> - </dict> - <key>firstVisibleColumn</key> - <integer>0</integer> - <key>firstVisibleLine</key> - <integer>0</integer> - </dict> - <key>examples/dev.html</key> - <dict> - <key>caret</key> - <dict> - <key>column</key> - <integer>34</integer> - <key>line</key> - <integer>8</integer> + <integer>67</integer> </dict> <key>firstVisibleColumn</key> <integer>0</integer> <key>firstVisibleLine</key> - <integer>0</integer> + <integer>44</integer> </dict> <key>src/core/object.js</key> <dict> @@ -141,7 +127,6 @@ <key>openDocuments</key> <array> <string>examples/dcalendar.html</string> - <string>examples/dev.html</string> <string>src/utilities/dcalendar.js</string> <string>src/core/object.js</string> <string>src/native/string.js</string> @@ -149,7 +134,48 @@ </array> <key>showFileHierarchyDrawer</key> <false/> + <key>showFileHierarchyPanel</key> + <true/> + <key>treeState</key> + <dict> + <key>jplus</key> + <dict> + <key>isExpanded</key> + <true/> + <key>subItems</key> + <dict> + <key>dist</key> + <dict> + <key>isExpanded</key> + <true/> + <key>subItems</key> + <dict/> + </dict> + <key>examples</key> + <dict> + <key>isExpanded</key> + <true/> + <key>subItems</key> + <dict/> + </dict> + <key>lib</key> + <dict> + <key>isExpanded</key> + <true/> + <key>subItems</key> + <dict/> + </dict> + <key>src</key> + <dict> + <key>isExpanded</key> + <true/> + <key>subItems</key> + <dict/> + </dict> + </dict> + </dict> + </dict> <key>windowFrame</key> - <string>{{253, 64}, {1143, 814}}</string> + <string>{{35, 67}, {1359, 811}}</string> </dict> </plist> jplus.tmproj @@ -323,6 +323,7 @@ DCalendar.core = Class.create({ if (!_dcal.unaccessor.include(target.get('st'))) target.className = target.className == 'selected' ? '' : 'selected'; target.setAttribute('st', target.className == '' ? target.get('realst') ? target.get('realst') : 'available' : target.className); var _end = parseInt(target.innerHTML); + // if (_end = _dcal.onmouse_start) return; if (_end < _dcal.onmouse_start) { _dcal.onmouse_end = _dcal.onmouse_start; _dcal.onmouse_start = _end; @@ -348,10 +349,11 @@ DCalendar.core = Class.create({ set_cache: function(container) { container = container || this.defaultc; - var days_line = $(this.defaultc.id + '_days'), _tds = days_line.getElementsByTagName('td'), _selected = ''; - $A(_tds).each(function(td) { - _selected += td.className == 'selected' ? '1' : '0'; - }); + var _days = this.days_of_month[this.month-1], _selected = ''; + (_days).times(function(i) { + var _td = $i(this.defaultc.id + '_days_' + (i + 1)); + _selected += _td.className == 'selected' ? '1' : '0'; + }, this); this.selected_cache[container.id][this.year + '-' + this.month] = _selected; this.dump(); }, @@ -360,7 +362,8 @@ DCalendar.core = Class.create({ container = container || this.defaultc; var _months = new Hash(this.selected_cache[container.id]), _result = ''; _months.each(function(pair) { - var _formated = this.format_cache(pair.value); + var _date = pair.key.split('-'); + var _formated = this.format_cache(pair.value, _date[0].to_i(), _date[1].to_i(), false); if (_formated != '') { _result += _result == '' ? _formated : ',' + _formated; } @@ -371,15 +374,17 @@ DCalendar.core = Class.create({ } catch(e) {} }, - format_cache: function(cache, is_append) { + format_cache: function(cache, year, month, is_append) { is_append = is_append || true; + year = year || this.year; + month = month || this.month; if (!$defined(cache)) return; var _start = '', _end = '', _days = cache.length, _sel_wrapper = $i(this.defaultc.id + '_selected'), _result = ''; _sel_wrapper.innerHTML = ''; (_days).times(function(i) { if (cache.charAt(i) == '1') { - var _the_day = this.year + '-' + this.month.toPaddedString(2) + '-' + (i + 1).toPaddedString(2); - $i(this.defaultc.id + '_days_' + (i + 1)).className = 'selected'; + var _the_day = year + '-' + month.toPaddedString(2) + '-' + (i + 1).toPaddedString(2); + if (is_append && month == this.month) $i(this.defaultc.id + '_days_' + (i + 1)).className = 'selected'; if (_start == '') { _start = _the_day; } else { @@ -390,7 +395,7 @@ DCalendar.core = Class.create({ } _result += _result == '' ? _the_day : ',' + _the_day; } else { - _end = this.year + '-' + this.month.toPaddedString(2) + '-' + (i).toPaddedString(2) + _end = year + '-' + month.toPaddedString(2) + '-' + (i).toPaddedString(2) if (_start != '' && is_append) _sel_wrapper.appendChild(this.selected_item(_start, _end)); _start = ''; _end = ''; src/utilities/dcalendar.js 15af67ad0b0a6c26ae05f02a0e71273dbfede2ca nowa nowa@nowa-mbp.local http://github.com/nowa/jplus/commit/354dd668140ced0420ab0f20045bd90de775468c 354dd668140ced0420ab0f20045bd90de775468c 2008-08-11T18:19:15-07:00 2008-08-11T18:19:15-07:00 修复切换月份后，format_cache和dump时的bug 33b7f18a106eb95c2770c60af50420373112b8aa nowa nowa@nowa-mbp.local