Changeset 7844

Timestamp:

03/29/07 17:55:03 (20 months ago)

Author:

pottedmeat

Message:

Fixes #2673. Changed a regex and a dojo.declare permutation

Location:

trunk/docscripts

Files:

• docparser.php (modified) (1 diff)
• inc/DojoObject.php (modified) (1 diff)

trunk/docscripts/docparser.php

@@ -96 +96 @@
         $init = $args[3]->getFunction();
       }
+                        if ($args[3]->isA(DojoObject)) {
+                                $args[4] = $args[3];
+                                $args[3] = null;
+                        }
     }
     else {

trunk/docscripts/inc/DojoObject.php

@@ -71 +71 @@
                                         break;
                                 }
-        if (preg_match('%^(\s*)([a-zA-Z0-9_$]+|"\s+"):%', $line, $match)) {
+        if (preg_match('%^(\s*)([a-zA-Z0-9_$]+|"\s+")\s*:%', $line, $match)) {
           if ($end[0] != $this->start[0] && $end[1] != $this->start[1]) {
             $between_lines = Text::chop($this->package->getSource(), $end[0], $end[1], $line_number, strlen($match[1]), true);