Changeset 12126

Timestamp:

01/22/08 10:29:22 (6 months ago)

Author:

elazutkin

Message:

dojox.highlight: minor clean up (!strict)

Location:

dojox/trunk/highlight

Files:

• tests/test_highlight.html (modified) (1 diff)
• _base.js (modified) (7 diffs)

dojox/trunk/highlight/tests/test_highlight.html

@@ -32 +32 @@
         </style>
 
-        <script type="text/javascript" djConfig="parseOnLoad:true, isDebug:true" src="../../../dojo/dojo.js"></script>
+        <script type="text/javascript" djConfig="parseOnLoad: true, isDebug: true" src="../../../dojo/dojo.js"></script>
         <script type="text/javascript" src="../_base.js"></script>
         <script type="text/javascript" src="../languages/cpp.js"></script>

dojox/trunk/highlight/_base.js

@@ -92 +92 @@
                                         mode.keywordGroups = mode.keywords;
                                 }else{ 
-                                        mode.keywordGroups = { keyword: mode.keywords };
+                                        mode.keywordGroups = {keyword: mode.keywords};
                                 }
                                 break;
@@ -102 +102 @@
                 if(lang.defaultMode && lang.modes){
                         buildKeywordGroups(lang.defaultMode);
-                        for(var key in lang.modes){
-                                buildKeywordGroups(lang.modes[key]);
-                        }
+                        dojo.forEach(lang.modes, buildKeywordGroups);
                 }
         }
@@ -142 +140 @@
         dojo.extend(Highlighter, {
                 buildRes: function(){
-                        for(var key in this.lang.modes){
-                                var mode = this.lang.modes[key];
+                        dojo.forEach(this.lang.modes, function(mode){
                                 if(mode.begin){
                                         mode.beginRe = this.langRe('^' + mode.begin);
@@ -153 +150 @@
                                         mode.illegalRe = this.langRe('^(?:' + mode.illegal + ')');
                                 }
-                        }
+                        }, this);
                         this.lang.defaultMode.illegalRe = this.langRe('^(?:' + this.lang.defaultMode.illegal + ')');
                 },
@@ -160 +157 @@
                         var classes = this.modes[this.modes.length - 1].contains;
                         if(classes){
-                                for(var i in classes){
+                                var modes = this.lang.modes;
+                                for(var i = 0; i < classes.length; ++i){
                                         var className = classes[i];
-                                        for(var key in this.lang.modes){
-                                                var mode = this.lang.modes[key];
-                                                if(mode.className == className && mode.beginRe.test(lexeme)){
-                                                        return mode;
-                                                }
+                                        for(var j = 0; j < modes.length; ++j){
+                                                var mode = modes[j];
+                                                if(mode.className == className && mode.beginRe.test(lexeme)){ return mode; }
                                         }
                                 }
@@ -197 +193 @@
                                 terminators = {};
                         if(mode.contains){
-                                for(var key in this.lang.modes){
-                                        var lmode = this.lang.modes[key];
-                                        if(dojo.indexOf(mode.contains, lmode.className) >= 0 && !(lmode.begin in terminators)){
+                                dojo.forEach(this.lang.modes, function(lmode){
+                                        if(dojo.indexOf(mode.contains, lmode.className) >= 0){
                                                 terminators[lmode.begin] = 1;
                                         }
-                                }
+                                });
                         }
                         for(var i = this.modes.length - 1; i >= 0; --i){
@@ -367 +362 @@
                         textBlock = blockText(block);
                 for(var key in dh.languages){
-                        if(key.charAt(0) == "_"){ continue; }   // skip internal members
+                        if(!dh.languages[key].defaultMode){ continue; } // skip internal members
                         var highlight = new Highlighter(key, textBlock),
                                 relevance = highlight.keywordCount + highlight.relevance;