Changeset 7653

Timestamp:

12/13/12 16:58:22 (11 years ago)

Author:

acoutinho

Message:

Ticket #2215 - A agenda esta com problema para ser exibida no IE

Location:

trunk/prototype/modules/calendar

Files:

• css/layout.css (modified) (3 diffs)
• js/drag_area.js (modified) (1 diff)
• js/init.js (modified) (2 diffs)

trunk/prototype/modules/calendar/css/layout.css

@@ -493 +493 @@
 }
 
+.my-calendars .button.new, .my-groups-task .button.new{ *margin: 7px 0 0 2px;}
+
 .my-calendars .status-list, .my-groups-task  .status-list {
         display: inline-block;
@@ -557 +559 @@
 }
 
-//Remover bordas indesejáveis no Ie
+/*Remover bordas indesejáveis no Ie*/
 input[type="checkbox"]{border: none 0px;}
 
@@ -596 +598 @@
 .my-calendars a.new-calendar .ui-button-text {
     padding: 0;
+}
+
+a.new-calendar-shared{
+
+    *margin: 7px 0 0 2px;
 }
 

trunk/prototype/modules/calendar/js/drag_area.js

@@ -5 +5 @@
 document.onmousedown = function(event) {
         // 'escapar' os campos onde o clique é bloqueado.
-        if (event.target.nodeName != 'INPUT' && event.target.nodeName != 'TEXTAREA' && event.target.nodeName != 'SELECT' && event.target.nodeName != 'OPTION'){
+        if (event && event.target.nodeName != 'INPUT' && event.target.nodeName != 'TEXTAREA' && event.target.nodeName != 'SELECT' && event.target.nodeName != 'OPTION'){
                 if (typeof event.preventDefault != 'undefined') {
                         event.preventDefault();

trunk/prototype/modules/calendar/js/init.js

@@ -520 +520 @@
                 $('#context-menu-event').html('');
          });
-         
-        if($(window).height() < $('body').height()){
-                var hei = $('body').height() - $(window).height();
-                hei = $('#divAppbox').height() - hei;
-                $('#divAppbox').css('max-height', hei);
-                $('#divAppbox').css('min-height', hei);
-                $('body').css('overflow-y','hidden');
-                delete hei;
-         }
+
+
+    if( $.browser.msie ){
+
+        $('body').css('overflow-y','hidden');
+
+
+    }else{
+
+        if($(window).height() < $('body').height()){
+            var hei = $('body').height() - $(window).height();
+            hei = $('#divAppbox').height() - hei;
+            $('#divAppbox').css('max-height', hei);
+            $('#divAppbox').css('min-height', hei);
+            $('body').css('overflow-y','hidden');
+            delete hei;
+        }
+
+        $(window).resize(function(){
+            $('#divAppbox').css('max-height', $(window).height() - 104);
+            $('#divAppbox').css('min-height', $(window).height() - 104);
+            $('#divAppbox').css('overflow-x', 'auto');
+            $('#divAppbox').css('overflow-y', 'scroll');
+        });
+    }
           
-         $(window).resize(function(){
-                $('#divAppbox').css('max-height', $(window).height() - 104);
-                $('#divAppbox').css('min-height', $(window).height() - 104);
-                $('#divAppbox').css('overflow-x', 'auto');
-                $('#divAppbox').css('overflow-y', 'scroll');
-        });       
+
+
+    if( $.browser.msie ){
+
+        $('#divAppbox').css('width', $(window).width());
+    }
+
+
         //Todo chamada do metodo que adiciona ao full calendar o botao de listagem de eventos  
         printEvents();
@@ -542 +560 @@
 
 function useDesktopNotification(){
+
         return !!parseInt(User.preferences.useDesktopNotification);
+
 }