Changeset 1560

Timestamp:

12/03/2006 09:15:22 PM (2 years ago)

Author:

xue

Message:

merge from 3.0 branch till 1559.

Location:

trunk

Files:

• HISTORY (modified) (3 diffs)
• UPGRADE (modified) (1 diff)
• framework/TApplication.php (modified) (1 diff)
• framework/Web/Javascripts/extra/logger.js (modified) (3 diffs)
• framework/Web/Javascripts/js/compressed/logger.js (modified) (3 diffs)
• framework/Web/Javascripts/js/debug/logger.js (modified) (3 diffs)
• framework/Web/UI/WebControls/TJavascriptLogger.php (modified) (4 diffs)
• index.html (modified) (1 diff)

trunk/HISTORY

@@ -19 +19 @@
 Version 3.0.6 December 4, 2006
 ==============================
+BUG: Ticket#400 - TJavascriptLogger incompatible with Firefox 2.0 RC1 (Wei)
 BUG: Ticket#442 - TPageService getBasePath in namespace form (Qiang)
 BUG: Ticket#443 - Template comment tag messed up with HTML comment tag (Qiang)
+BUG: Ticket#453 - I18N controls should accept UNIX timestamps (Wei)
+BUG: Ticket#463 - TPhpErrorException: Non-static method DateTimeFormatInfo::getInstance() (Wei)
 BUG: Ticket#467 - typo in TUrlMapping.php (Qiang)
+BUG: Ticket#476 - Problem when adding a new text (translate) with MessageSource_XLIFF (Wei)
 BUG: TTableCell should render   only when Text is not set and there's no child (Qiang)
 BUG: global state was not saved when redirect() is invoked (Qiang)
@@ -29 +33 @@
 ENH: Ticket#468 - Added support of using all property tags in skins (Qiang)
 ENH: Ticket#471 - Added methods in TAssetManager to expose published path and URL (Qiang)
+ENH: Add ToggleKey for TJavascriptLogger (Wei)
 CHG: Ticket#437 - __autoload is replaced by spl_autoload_register (Qiang)
 CHG: Ticket#454 - Redundant PHP Version Check (Qiang)
@@ -37 +42 @@
 CHG: TDataBoundControl will not throw exception if CurrentPageIndex is out of range (Qiang)
 NEW: TUrlManager (Qiang)
+
 
 Version 3.0.5 October 23, 2006

trunk/UPGRADE

@@ -31 +31 @@
 - If TUrlMapping is used, you need to set the UrlManager property of
   THttpRequest to the module ID of TUrlMapping.
+- TJavascriptLogger toggle key is changed from ALT-D to ALT-J. 
+   Use the ToggleKey property chanage to a different key.
 
 Upgrading from v3.0.4

trunk/framework/TApplication.php

@@ -807 +807 @@
                 if($this->_configFile===null)
                 {
-                        $this->getRequest()->setAvailableServices(array(self::PAGE_SERVICE_ID));
+                        $request=$this->getRequest();
+                        $request->setAvailableServices(array(self::PAGE_SERVICE_ID));
+                        $request->resolveRequest();
                         $this->_service=$this->getPageService();
                         return;

trunk/framework/Web/Javascripts/extra/logger.js

@@ -201 +201 @@
   // -------
 
-  initialize : function() {
+  initialize : function(toggleKey) {
     this.outputCount = 0
     this.tagPattern = Cookie.get('tagPattern') || ".*"
@@ -284 +284 @@
                 this.logElement.style.bottom="0px";
         }
+        var self=this;
+        Event.observe(document, 'keydown', function(e)
+        { 
+                if((e.altKey==true) && Event.keyCode(e) == toggleKey ) //Alt+J | Ctrl+J
+                        self.toggle();
+        });
 
     // Listen to the logger....
@@ -452 +458 @@
         }
 }
-
-// Load the Console when the window loads
-var logConsole;
-Event.OnLoad(function() { logConsole = new LogConsole()});
-
-
 
 

trunk/framework/Web/Javascripts/js/compressed/logger.js

@@ -41 +41 @@
 this.tag=tag}}
 LogConsole=Class.create()
-LogConsole.prototype={commandHistory:[],commandIndex:0,hidden:true,initialize:function(){this.outputCount=0
+LogConsole.prototype={commandHistory:[],commandIndex:0,hidden:true,initialize:function(toggleKey){this.outputCount=0
 this.tagPattern=Cookie.get('tagPattern')||".*"
 this.logElement=document.createElement('div')
@@ -98 +98 @@
 else
 {this.logElement.style.position="fixed";this.logElement.style.bottom="0px";}
-Logger.onupdate.addListener(this.logUpdate.bind(this))
+var self=this;Event.observe(document,'keydown',function(e)
+{if((e.altKey==true)&&Event.keyCode(e)==toggleKey)
+self.toggle();});Logger.onupdate.addListener(this.logUpdate.bind(this))
 Logger.onclear.addListener(this.clear.bind(this))
 for(var i=0;i<Logger.logEntries.length;i++){this.logUpdate(Logger.logEntries[i])}
@@ -153 +155 @@
 this.inputElement.value=this.commandHistory[this.commandIndex]}
 else{this.commandIndex=0}}}
-var logConsole;Event.OnLoad(function(){logConsole=new LogConsole()});function inspect(o)
+function inspect(o)
 {var objtype=typeof(o);if(objtype=="undefined"){return"undefined";}else if(objtype=="number"||objtype=="boolean"){return o+"";}else if(o===null){return"null";}
 try{var ostring=(o+"");}catch(e){return"["+typeof(o)+"]";}

trunk/framework/Web/Javascripts/js/debug/logger.js

@@ -201 +201 @@
   // -------
 
-  initialize : function() {
+  initialize : function(toggleKey) {
     this.outputCount = 0
     this.tagPattern = Cookie.get('tagPattern') || ".*"
@@ -284 +284 @@
                 this.logElement.style.bottom="0px";
         }
+        var self=this;
+        Event.observe(document, 'keydown', function(e)
+        { 
+                if((e.altKey==true) && Event.keyCode(e) == toggleKey ) //Alt+J | Ctrl+J
+                        self.toggle();
+        });
 
     // Listen to the logger....
@@ -452 +458 @@
         }
 }
-
-// Load the Console when the window loads
-var logConsole;
-Event.OnLoad(function() { logConsole = new LogConsole()});
-
-
 
 

trunk/framework/Web/UI/WebControls/TJavascriptLogger.php

@@ -33 +33 @@
 class TJavascriptLogger extends TWebControl
 {
+        private static $_keyCodes = array(
+                '0'=>48, '1'=>49, '2'=>50, '3'=>51, '4'=>52, '5'=>53, '6'=>54, '7'=>55, '8'=>56, '9'=>57, 
+                'a'=>65, 'b'=>66, 'c'=>67, 'd'=>68, 'e'=>69, 'f'=>70, 'g'=>71, 'h'=>72,
+                'i'=>73, 'j'=>74, 'k'=>75, 'l'=>76, 'm'=>77, 'n'=>78, 'o'=>79, 'p'=>80,
+                'q'=>81, 'r'=>82, 's'=>83, 't'=>84, 'u'=>85, 'v'=>86, 'w'=>87, 'x'=>88, 'y'=>89, 'z'=>90);
+
         /**
          * @return string tag name of the panel
@@ -42 +48 @@
 
         /**
+         * @param string keyboard key for toggling the console, default is J.
+         */
+        public function setToggleKey($value)
+        {
+                $this->setViewState('ToggleKey', $value, 'j');
+        }
+
+        /**
+         * @return string keyboard key for toggling the console.
+         */
+        public function getToggleKey()
+        {
+                return $this->getViewState('ToggleKey', 'j');
+        }
+
+        /**
          * Registers the required logger javascript.
          * @param TEventParameter event parameter
@@ -47 +69 @@
         public function onPreRender($param)
         {
-                $this->getPage()->getClientScript()->registerPradoScript('logger');
+                $key = strtolower($this->getToggleKey());
+                $code = isset(self::$_keyCodes[$key]) ? self::$_keyCodes[$key] : 74;
+                $js = "var logConsole; Event.OnLoad(function() { logConsole = new LogConsole($code)}); ";
+                $cs = $this->getPage()->getClientScript();
+                $cs->registerBeginScript($this->getClientID(),$js);
+                $cs->registerPradoScript('logger');
         }
 
@@ -57 +84 @@
         public function renderContents($writer)
         {
+                $code = strtoupper($this->getToggleKey());
                 $info = '(<a href="http://gleepglop.com/javascripts/logger/" target="_blank">more info</a>).';
                 $link = '<a href="javascript:if(logConsole)logConsole.toggle()">toggle the javascript log console.</a>';
-                $usage = 'Press ALT-D (Or CTRL-D on OS X) to';
+                $usage = 'Press ALT-'.$code.' (Or CTRL-'.$code.' on OS X) to';
                 $writer->write("{$usage} {$link} {$info}");
         }

trunk/index.html

@@ -8 +8 @@
 <body>
 <h1>PRADO Framework for PHP 5 </h1>
-<p>Version 3.0.5, October 23, 2006<br>
+<p>Version 3.0.6, December 4, 2006<br>
 Copyright&copy; 2004-2006 by <a href="http://www.pradosoft.com/">PradoSoft</a><br>
 All Rights Reserved.