Fixed an bug where if the console did not define a welcome message, t…

…he first line would never reset properly.
datapimp · Jun 15, 2010 · f680bb4 · f680bb4
1 parent db84a4e
commit f680bb4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/demo.html b/demo.html
@@ -12,7 +12,7 @@
          /* First console */
          var console1 = $('<div class="console1">');
          $('body').append(console1);
-         console1.console({
+         var controller1 = console1.console({
            promptLabel: 'Demo> ',
            commandValidate:function(line){
              if (line == "") return false;
@@ -57,7 +57,7 @@
          var console3CancelFlag = false;
          var console3 = $('<div class="console3">');
          $('body').append(console3);
-         console3.console({
+         var controller3 = console3.console({
            promptLabel: 'Echo> ',
            commandValidate:function(line){
              if (line == "") return false;

diff --git a/jquery.console.js b/jquery.console.js
@@ -152,12 +152,13 @@
         ////////////////////////////////////////////////////////////////////////
         // Reset terminal
         extern.reset = function(){
-            var welcome = true;
+            var welcome = (typeof config.welcomeMessage != 'undefined');
             inner.parent().fadeOut(function(){
                 inner.find('div').each(function(){
-                    if (!welcome) 
+                    if (!welcome) {
                         $(this).remove();
-                    welcome = false;
+			welcome = false;
+		    }
                 });
                 newPromptBox();
                 inner.parent().fadeIn(function(){