commit
authorEdward <edward@roojs.com>
Fri, 14 Mar 2014 10:54:45 +0000 (18:54 +0800)
committerEdward <edward@roojs.com>
Fri, 14 Mar 2014 10:54:45 +0000 (18:54 +0800)
Roo/bootstrap/Calendar.js
Roo/bootstrap/Popover.js
roojs-bootstrap-debug.js
roojs-bootstrap.js

index c7ba79d..cacd94e 100644 (file)
@@ -343,14 +343,14 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
         
         var firstOfMonth = date.getFirstDateOfMonth();
         var startingPos = firstOfMonth.getDay()-this.startDay;
-
+        
         if(startingPos < this.startDay){
             startingPos += 7;
         }
-
+        
         var pm = date.add("mo", -1);
         var prevStart = pm.getDaysInMonth()-startingPos;
-
+        
         var cells = this.cells.elements;
         var textEls = this.textNodes;
         days += startingPos;
@@ -407,13 +407,16 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
                     cell.className = " fc-state-disabled";
                 }
             }
+            
             if (!cell.initialClassName) {
                 cell.initialClassName = cell.dom.className;
             }
+            
             cell.dom.className = cell.initialClassName  + ' ' +  cell.className;
         };
 
         var i = 0;
+        
         for(; i < startingPos; i++) {
             textEls[i].innerHTML = (++prevStart);
             d.setDate(d.getDate()+1);
@@ -587,7 +590,7 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
         // first make sure there is enough space..
         
         this.cells.each(function(c) {
-//            Roo.log(c.select('.fc-day-content div',true).first(), Math.max(34, c.rows * 20));
+        
             c.select('.fc-day-content div',true).first().setHeight(Math.max(34, c.rows * 20));
         });
         
@@ -641,8 +644,8 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
                 var ctr = this.el.select('.fc-event-container',true).first();
                 var cg = ctr.createChild(cfg);
                 
-                cg.on('mouseenter' ,this.onEventEnter, this);
-                cg.on('mouseleave' ,this.onEventLeave, this);
+                cg.on('mouseenter' ,this.onEventEnter, this, ev);
+                cg.on('mouseleave' ,this.onEventLeave, this, ev);
                 
                 ev.els.push(cg);
                 
@@ -658,12 +661,12 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
         
     },
     
-    onEventEnter: function (e, el,c,d) {
-        this.fireEvent('evententer', this, el);
+    onEventEnter: function (e, el,event,d) {
+        this.fireEvent('evententer', this, el, event);
     },
     
-    onEventLeave: function (e, el,c,d) {
-        this.fireEvent('eventleave', this, el);
+    onEventLeave: function (e, el,event,d) {
+        this.fireEvent('eventleave', this, event);
     },
     
     onMonthChange: function () {
@@ -673,7 +676,7 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
     onLoad: function () {
         
         this.clearEvents();
-        
+//        
         this.calevents = [];
         var cal = this;
         if(this.store.getCount() > 0){
index b45ee19..65d2bd8 100644 (file)
@@ -42,7 +42,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component,  {
     getAutoCreate : function(){
          Roo.log('make popover?');
         var cfg = {
-           cls : 'popover',
+           cls : 'popover roo-dynamic',
            style: 'display:block',
            cn : [
                 {
index 1c403aa..ebedd1a 100644 (file)
@@ -8086,14 +8086,14 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
         
         var firstOfMonth = date.getFirstDateOfMonth();
         var startingPos = firstOfMonth.getDay()-this.startDay;
-
+        
         if(startingPos < this.startDay){
             startingPos += 7;
         }
-
+        
         var pm = date.add("mo", -1);
         var prevStart = pm.getDaysInMonth()-startingPos;
-
+        
         var cells = this.cells.elements;
         var textEls = this.textNodes;
         days += startingPos;
@@ -8150,13 +8150,16 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
                     cell.className = " fc-state-disabled";
                 }
             }
+            
             if (!cell.initialClassName) {
                 cell.initialClassName = cell.dom.className;
             }
+            
             cell.dom.className = cell.initialClassName  + ' ' +  cell.className;
         };
 
         var i = 0;
+        
         for(; i < startingPos; i++) {
             textEls[i].innerHTML = (++prevStart);
             d.setDate(d.getDate()+1);
@@ -8330,7 +8333,7 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
         // first make sure there is enough space..
         
         this.cells.each(function(c) {
-//            Roo.log(c.select('.fc-day-content div',true).first(), Math.max(34, c.rows * 20));
+        
             c.select('.fc-day-content div',true).first().setHeight(Math.max(34, c.rows * 20));
         });
         
@@ -8384,8 +8387,8 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
                 var ctr = this.el.select('.fc-event-container',true).first();
                 var cg = ctr.createChild(cfg);
                 
-                cg.on('mouseenter' ,this.onEventEnter, this);
-                cg.on('mouseleave' ,this.onEventLeave, this);
+                cg.on('mouseenter' ,this.onEventEnter, this, ev);
+                cg.on('mouseleave' ,this.onEventLeave, this, ev);
                 
                 ev.els.push(cg);
                 
@@ -8401,12 +8404,12 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
         
     },
     
-    onEventEnter: function (e, el,c,d) {
-        this.fireEvent('evententer', this, el);
+    onEventEnter: function (e, el,event,d) {
+        this.fireEvent('evententer', this, el, event);
     },
     
-    onEventLeave: function (e, el,c,d) {
-        this.fireEvent('eventleave', this, el);
+    onEventLeave: function (e, el,event,d) {
+        this.fireEvent('eventleave', this, event);
     },
     
     onMonthChange: function () {
@@ -8416,7 +8419,7 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
     onLoad: function () {
         
         this.clearEvents();
-        
+//        
         this.calevents = [];
         var cal = this;
         if(this.store.getCount() > 0){
@@ -8425,7 +8428,8 @@ Roo.extend(Roo.bootstrap.Calendar, Roo.bootstrap.Component,  {
                     start: new Date(d.data.start_dt),
                     end : new Date(d.data.end_dt),
                     time : d.data.start_time,
-                    title : d.data.title
+                    title : d.data.title,
+                    description : d.data.description
                 });
             });
         }
@@ -8479,7 +8483,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component,  {
     getAutoCreate : function(){
          Roo.log('make popover?');
         var cfg = {
-           cls : 'popover',
+           cls : 'popover roo-dynamic',
            style: 'display:block',
            cn : [
                 {
index 9ab44dd..6a1cd54 100644 (file)
@@ -196,10 +196,10 @@ A.push(c);});return A;},findBestRow:function(A){var B=0;for(var i=0;i<A.length;i
 C.push(B);B={start:A[i],end:A[i]};}
 C.push(B);ev.els=[];ev.rows=C;ev.cells=A;for(var i=0;i<A.length;i++){A[i].rows=Math.max(A[i].rows||0,ev.row+1);}
 this.calevents.push(ev);},clearEvents:function(){if(!this.calevents){return;}
-Roo.each(this.cells.elements,function(c){c.rows=0;});Roo.each(this.calevents,function(e){Roo.each(e.els,function(el){el.un('mouseenter',this.onEventEnter,this);el.un('mouseleave',this.onEventLeave,this);el.remove();},this);},this);},renderEvents:function(){this.cells.each(function(c){c.select('.fc-day-content div',true).first().setHeight(Math.max(34,c.rows*20));});for(var e=0;e<this.calevents.length;e++){var ev=this.calevents[e];var A=ev.cells;var B=ev.rows;for(var i=0;i<B.length;i++){var C={cls:'roo-dynamic fc-event fc-event-hori fc-event-draggable ui-draggable',style:'position: absolute',unselectable:"on",cn:[{cls:'fc-event-inner',cn:[{tag:'span',cls:'fc-event-time',html:A.length>1?'':ev.time},{tag:'span',cls:'fc-event-title',html:String.format('{0}',ev.title)}]},{cls:'ui-resizable-handle ui-resizable-e',html:'&nbsp;&nbsp;&nbsp'}]};if(i==0){C.cls+=' fc-event-start';}if((i+1)==B.length){C.cls+=' fc-event-end';}var D=this.el.select('.fc-event-container',true).first();var cg=D.createChild(C);cg.on('mouseenter',this.onEventEnter,this);cg.on('mouseleave',this.onEventLeave,this);ev.els.push(cg);var E=B[i].start.select('.fc-day-content',true).first().getBox();var F=B[i].end.select('.fc-day-content',true).first().getBox();cg.setXY([E.x+2,E.y+(ev.row*20)]);cg.setWidth(F.right-E.x-2);}}},onEventEnter:function(e,el,c,d){this.fireEvent('evententer',this,el);},onEventLeave:function(e,el,c,d){this.fireEvent('eventleave',this,el);},onMonthChange:function(){this.store.load();},onLoad:function(){this.clearEvents();this.calevents=[];var A=this;if(this.store.getCount()>0){this.store.data.each(function(d){A.addItem({start:new Date(d.data.start_dt),end:new Date(d.data.end_dt),time:d.data.start_time,title:d.data.title});});}
+Roo.each(this.cells.elements,function(c){c.rows=0;});Roo.each(this.calevents,function(e){Roo.each(e.els,function(el){el.un('mouseenter',this.onEventEnter,this);el.un('mouseleave',this.onEventLeave,this);el.remove();},this);},this);},renderEvents:function(){this.cells.each(function(c){c.select('.fc-day-content div',true).first().setHeight(Math.max(34,c.rows*20));});for(var e=0;e<this.calevents.length;e++){var ev=this.calevents[e];var A=ev.cells;var B=ev.rows;for(var i=0;i<B.length;i++){var C={cls:'roo-dynamic fc-event fc-event-hori fc-event-draggable ui-draggable',style:'position: absolute',unselectable:"on",cn:[{cls:'fc-event-inner',cn:[{tag:'span',cls:'fc-event-time',html:A.length>1?'':ev.time},{tag:'span',cls:'fc-event-title',html:String.format('{0}',ev.title)}]},{cls:'ui-resizable-handle ui-resizable-e',html:'&nbsp;&nbsp;&nbsp'}]};if(i==0){C.cls+=' fc-event-start';}if((i+1)==B.length){C.cls+=' fc-event-end';}var D=this.el.select('.fc-event-container',true).first();var cg=D.createChild(C);cg.on('mouseenter',this.onEventEnter,this,ev);cg.on('mouseleave',this.onEventLeave,this,ev);ev.els.push(cg);var E=B[i].start.select('.fc-day-content',true).first().getBox();var F=B[i].end.select('.fc-day-content',true).first().getBox();cg.setXY([E.x+2,E.y+(ev.row*20)]);cg.setWidth(F.right-E.x-2);}}},onEventEnter:function(e,el,A,d){this.fireEvent('evententer',this,el,A);},onEventLeave:function(e,el,A,d){this.fireEvent('eventleave',this,A);},onMonthChange:function(){this.store.load();},onLoad:function(){this.clearEvents();this.calevents=[];var A=this;if(this.store.getCount()>0){this.store.data.each(function(d){A.addItem({start:new Date(d.data.start_dt),end:new Date(d.data.end_dt),time:d.data.start_time,title:d.data.title,description:d.data.description});});}
 this.renderEvents();}});
 //Roo/bootstrap/Popover.js
-Roo.bootstrap.Popover=function(A){Roo.bootstrap.Popover.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.Popover,Roo.bootstrap.Component,{title:'Fill in a title',html:false,placement:'right',trigger:'hover',over:'parent',getChildContainer:function(){return this.el.select('.popover-content',true).first();},getAutoCreate:function(){Roo.log('make popover?');var A={cls:'popover',style:'display:block',cn:[{cls:'arrow'},{cls:'popover-inner',cn:[{tag:'h3',cls:'popover-title',html:this.title},{cls:'popover-content',html:this.html}]}]};return A;},setTitle:function(A){this.el.select('.popover-title',true).first().dom.innerHTML=A;},setContent:function(A){this.el.select('.popover-content',true).first().dom.innerHTML=A;},onRender:function(ct,A){Roo.bootstrap.Component.superclass.onRender.call(this,ct,A);if(!this.el){var B=Roo.apply({},this.getAutoCreate());B.id=Roo.id();if(this.cls){B.cls+=' '+this.cls;}if(this.style){B.style=this.style;}
+Roo.bootstrap.Popover=function(A){Roo.bootstrap.Popover.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.Popover,Roo.bootstrap.Component,{title:'Fill in a title',html:false,placement:'right',trigger:'hover',over:'parent',getChildContainer:function(){return this.el.select('.popover-content',true).first();},getAutoCreate:function(){Roo.log('make popover?');var A={cls:'popover roo-dynamic',style:'display:block',cn:[{cls:'arrow'},{cls:'popover-inner',cn:[{tag:'h3',cls:'popover-title',html:this.title},{cls:'popover-content',html:this.html}]}]};return A;},setTitle:function(A){this.el.select('.popover-title',true).first().dom.innerHTML=A;},setContent:function(A){this.el.select('.popover-content',true).first().dom.innerHTML=A;},onRender:function(ct,A){Roo.bootstrap.Component.superclass.onRender.call(this,ct,A);if(!this.el){var B=Roo.apply({},this.getAutoCreate());B.id=Roo.id();if(this.cls){B.cls+=' '+this.cls;}if(this.style){B.style=this.style;}
 Roo.log("adding to ")
 this.el=Roo.get(document.body).createChild(B,A);Roo.log(this.el);}
 this.initEvents();},initEvents:function(){this.el.select('.popover-title',true).setVisibilityMode(Roo.Element.DISPLAY);this.el.enableDisplayMode('block');this.el.hide();if(this.over===false){return;}if(this.triggers===false){return;}var A=(this.over=='parent')?this.parent().el:Roo.get(this.over);var B=this.trigger?this.trigger.split(' '):[];Roo.each(B,function(C){if(C=='click'){A.on('click',this.toggle,this);}else if(C!='manual'){var D=C=='hover'?'mouseenter':'focusin'var eventOut=C=='hover'?'mouseleave':'focusout'A.on(D,this.enter,this);A.on(eventOut,this.leave,this);}},this);},timeout:null,hoverState:null,toggle:function(){this.hoverState=='in'?this.leave():this.enter();},enter:function(){clearTimeout(this.timeout);this.hoverState='in'if(!this.delay||!this.delay.show){this.show();return}var _t=this;this.timeout=setTimeout(function(){if(_t.hoverState=='in'){_t.show();}},this.delay.show)},leave:function(){clearTimeout(this.timeout);this.hoverState='out'if(!this.delay||!this.delay.hide){this.hide();return}var _t=this;this.timeout=setTimeout(function(){if(_t.hoverState=='out'){_t.hide();}},this.delay.hide)},show:function(A){if(!A){A=(this.over=='parent')?this.parent().el:Roo.get(this.over);}