projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sync
[roojs1]
/
roojs-calendar-debug.js
diff --git
a/roojs-calendar-debug.js
b/roojs-calendar-debug.js
index
9216511
..
2854206
100644
(file)
--- a/
roojs-calendar-debug.js
+++ b/
roojs-calendar-debug.js
@@
-9,6
+9,8
@@
Roo.bootstrap = Roo.bootstrap || {};
/**
* @class Roo.bootstrap.Component
* @extends Roo.Component
/**
* @class Roo.bootstrap.Component
* @extends Roo.Component
+ * @abstract
+ * @children Roo.bootstrap.Component
* Bootstrap Component base class
* @cfg {String} cls css class
* @cfg {String} style any extra css
* Bootstrap Component base class
* @cfg {String} cls css class
* @cfg {String} style any extra css
@@
-117,11
+119,11
@@
Roo.extend(Roo.bootstrap.Component, Roo.BoxComponent, {
}
if (this.cls) {
}
if (this.cls) {
- cfg.cls = (typeof(cfg.cls) == 'undefined'
) ? this.cls : cfg.cls
+ ' ' + this.cls;
+ cfg.cls = (typeof(cfg.cls) == 'undefined'
? this.cls : cfg.cls)
+ ' ' + this.cls;
}
if (this.style) { // fixme needs to support more complex style data.
}
if (this.style) { // fixme needs to support more complex style data.
- cfg.style = this.style;
+ cfg.style =
(typeof(cfg.style) == 'undefined' ? this.style : cfg.style) + '; ' +
this.style;
}
if(this.name){
}
if(this.name){
@@
-493,6
+495,11
@@
Roo.bootstrap.Calendar = function(config){
Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, {
Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component, {
+ /**
+ * @cfg {Roo.data.Store} store
+ * The data source for the calendar
+ */
+ store : false,
/**
* @cfg {Number} startDay
* Day index at which the week should begin, 0-based (defaults to 0, which is Sunday)
/**
* @cfg {Number} startDay
* Day index at which the week should begin, 0-based (defaults to 0, which is Sunday)