From cb37fcab4cde1bdd473b22cc31f2c481b8b2b8fa Mon Sep 17 00:00:00 2001
From: rapster <rapster@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Wed, 28 Oct 2015 12:16:29 +0000
Subject: [PATCH] www/codemirror/fhem_codemirror.js: Do not evaluate attr
 codemirrorParam if already loaded.

git-svn-id: https://svn.fhem.de/fhem/trunk@9706 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/www/codemirror/fhem_codemirror.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fhem/www/codemirror/fhem_codemirror.js b/fhem/www/codemirror/fhem_codemirror.js
index 7b77bfd3f..c69aa0e0b 100644
--- a/fhem/www/codemirror/fhem_codemirror.js
+++ b/fhem/www/codemirror/fhem_codemirror.js
@@ -71,13 +71,13 @@ $(document).ready(function(){
 });
 
 function AddCodeMirror(e, cb) {
+    if(cm_active && cm_loaded == cm_active)
+        return cm_wait(e, cb);
+        
     var userAttr = scriptAttribute("fhem_codemirror.js");
     for(var a in userAttr)
         cm_attr[a] = userAttr[a];
 
-    if(cm_active && cm_loaded == cm_active)
-        return cm_wait(e, cb);
-
     cm_active++;
       loadLink("codemirror/codemirror.css");
       loadScript("codemirror/codemirror.js", function(){cm_loaded++;} );
@@ -97,7 +97,7 @@ function AddCodeMirror(e, cb) {
     }
     if (cm_attr.comment) {
         cm_active++; loadScript("codemirror/comment.js", function(){cm_loaded++;} );
-        cm_attr.extraKeys['Ctrl-Q'] = function(cm) { 
+        cm_attr.extraKeys['Ctrl-Q'] = function(cm) {
             cm.toggleComment({ indent: false, lineComment: "#" });
         };
     }
@@ -137,8 +137,8 @@ function AddCodeMirror(e, cb) {
 }
 
 function cm_wait(cm_editor, callback, recursions) {
-    recursions = typeof recursions !== 'undefined' ? recursions : 0;
     if(cm_loaded != cm_active) {
+        recursions = typeof recursions !== 'undefined' ? recursions : 0;
         if(recursions < 100) {
             recursions++;
             setTimeout(function(){ cm_wait(cm_editor, callback, recursions) }, 20);