Changeset 4608 in subversion

Timestamp:

Mar 15, 2011 4:24:19 AM (2 years ago)

Author:

alec

Message:

• Move console initialization to rcube.init(), hide console area if browser's console exists, some code cleanup

Location:

trunk/roundcubemail/program/js

Files:

• app.js (modified) (1 diff)
• common.js (modified) (5 diffs)

trunk/roundcubemail/program/js/app.js

@@ -134 +134 @@
       this.goto_url('error', '_code=0x199');
       return;
+    }
+
+    // Enable debug console
+    if (!window.console) {
+      console = new rcube_console();
+    }
+    else {
+      $('#console').hide();
     }
 

trunk/roundcubemail/program/js/common.js

@@ -82 +82 @@
 
   // get real language out of safari's user agent
-  if(this.safari && (/;\s+([a-z]{2})-[a-z]{2}\)/.test(this.agent_lc)))
+  if (this.safari && (/;\s+([a-z]{2})-[a-z]{2}\)/.test(this.agent_lc)))
     this.lang = RegExp.$1;
 
@@ -583 +583 @@
 function rcube_mouse_is_over(ev, obj)
 {
-  var mouse = rcube_event.get_mouse_pos(ev);
-  var pos = $(obj).offset();
+  var mouse = rcube_event.get_mouse_pos(ev),
+    pos = $(obj).offset();
 
   return ((mouse.x >= pos.left) && (mouse.x < (pos.left + obj.offsetWidth)) &&
@@ -604 +604 @@
 function getCookie(name)
 {
-  var dc = document.cookie;
-  var prefix = name + "=";
-  var begin = dc.indexOf("; " + prefix);
+  var dc = document.cookie,
+    prefix = name + "=",
+    begin = dc.indexOf("; " + prefix);
+
   if (begin == -1) {
     begin = dc.indexOf(prefix);
-    if (begin != 0) return null;
-  }
-  else
+    if (begin != 0)
+      return null;
+  }
+  else {
     begin += 2;  
+  }
+
   var end = document.cookie.indexOf(";", begin);
   if (end == -1)
     end = dc.length;
+
   return unescape(dc.substring(begin + prefix.length, end));
 };
@@ -635 +640 @@
         msg += '\n--------------------------------------\n';
 
-      // Konqueror doesn't allows to just change value of hidden element
+      // Konqueror doesn't allow to just change the value of hidden element
       if (bw.konq) {
         box.innerText += msg;
@@ -655 +660 @@
 bw.set_html_class();
 
-if (!window.console) 
-  console = new rcube_console();
-
 
 // Add escape() method to RegExp object