Fix alt buffer restore

bower.json

@@ -0,0 +1,20 @@
+{
+  "name": "butterfly",
+  "version": "1.0.0",
+  "authors": [
+    "Florian Mounier <florian.mounier@kozea.fr>"
+  ],
+  "description": "A sleek web based terminal emulator",
+  "license": "None",
+  "private": true,
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "google-caja": "*"
+  }
+}

butterfly/static/main.css

@@ -167,6 +167,7 @@ body {
   .fg-color-0.reverse-video {
     background-color: #2e3436 !important; }
 
+/* Black */
 .bg-color-1 {
   background-color: #cc0000; }
   .bg-color-1.reverse-video {
@@ -178,6 +179,7 @@ body {
   .fg-color-1.reverse-video, .reverse-video.nbsp {
     background-color: #cc0000 !important; }
 
+/* Red */
 .bg-color-2 {
   background-color: #4e9a06; }
   .bg-color-2.reverse-video {
@@ -189,6 +191,7 @@ body {
   .fg-color-2.reverse-video {
     background-color: #4e9a06 !important; }
 
+/* Green */
 .bg-color-3 {
   background-color: #c4a000; }
   .bg-color-3.reverse-video {
@@ -200,6 +203,7 @@ body {
   .fg-color-3.reverse-video {
     background-color: #c4a000 !important; }
 
+/* Yellow */
 .bg-color-4 {
   background-color: #3465a4; }
   .bg-color-4.reverse-video {
@@ -211,6 +215,7 @@ body {
   .fg-color-4.reverse-video {
     background-color: #3465a4 !important; }
 
+/* Blue */
 .bg-color-5 {
   background-color: #75507b; }
   .bg-color-5.reverse-video {
@@ -222,6 +227,7 @@ body {
   .fg-color-5.reverse-video {
     background-color: #75507b !important; }
 
+/* Magenta */
 .bg-color-6 {
   background-color: #06989a; }
   .bg-color-6.reverse-video {
@@ -233,6 +239,7 @@ body {
   .fg-color-6.reverse-video {
     background-color: #06989a !important; }
 
+/* Cyan */
 .bg-color-7 {
   background-color: #d3d7cf; }
   .bg-color-7.reverse-video {
@@ -244,6 +251,7 @@ body {
   .fg-color-7.reverse-video {
     background-color: #d3d7cf !important; }
 
+/* White */
 .bg-color-8 {
   background-color: #555753; }
   .bg-color-8.reverse-video {
@@ -255,6 +263,7 @@ body {
   .fg-color-8.reverse-video {
     background-color: #555753 !important; }
 
+/* Bright Black */
 .bg-color-9 {
   background-color: #ef2929; }
   .bg-color-9.reverse-video {
@@ -266,6 +275,7 @@ body {
   .fg-color-9.reverse-video {
     background-color: #ef2929 !important; }
 
+/* Bright Red */
 .bg-color-10 {
   background-color: #8ae234; }
   .bg-color-10.reverse-video {
@@ -277,6 +287,7 @@ body {
   .fg-color-10.reverse-video {
     background-color: #8ae234 !important; }
 
+/* Bright Green */
 .bg-color-11 {
   background-color: #fce94f; }
   .bg-color-11.reverse-video {
@@ -288,6 +299,7 @@ body {
   .fg-color-11.reverse-video {
     background-color: #fce94f !important; }
 
+/* Bright Yellow */
 .bg-color-12 {
   background-color: #729fcf; }
   .bg-color-12.reverse-video {
@@ -299,6 +311,7 @@ body {
   .fg-color-12.reverse-video {
     background-color: #729fcf !important; }
 
+/* Bright Blue */
 .bg-color-13 {
   background-color: #ad7fa8; }
   .bg-color-13.reverse-video {
@@ -310,6 +323,7 @@ body {
   .fg-color-13.reverse-video {
     background-color: #ad7fa8 !important; }
 
+/* Bright Magenta */
 .bg-color-14 {
   background-color: #34e2e2; }
   .bg-color-14.reverse-video {
@@ -321,6 +335,7 @@ body {
   .fg-color-14.reverse-video {
     background-color: #34e2e2 !important; }
 
+/* Bright Cyan */
 .bg-color-15 {
   background-color: #eeeeec; }
   .bg-color-15.reverse-video {
@@ -332,6 +347,7 @@ body {
   .fg-color-15.reverse-video {
     background-color: #eeeeec !important; }
 
+/* Bright White */
 /* *-* coding: utf-8 *-* */
 /* This file is part of butterfly */
 /* butterfly Copyright (C) 2014  Florian Mounier */
@@ -3091,10 +3107,8 @@ body {
 @keyframes blink {
   0% {
     opacity: 1; }
-
   50% {
     opacity: 0; }
-
   100% {
     opacity: 1; } }
 

butterfly/static/main.js

@@ -1990,7 +1990,7 @@
         } else if (p === 8) {
           this.curAttr.invisible = true;
         } else if (p === 10) {
-
+          void 0;
         } else if (p === 22) {
           this.curAttr.bold = false;
         } else if (p === 24) {
@@ -2409,7 +2409,7 @@
               this.scrollBottom = this.normal.scrollBottom;
               this.tabs = this.normal.tabs;
               this.normal = null;
-              this.reset();
+              this.refresh(true);
               return this.showCursor();
             }
         }

coffees/term.coffee

@@ -507,7 +507,7 @@ class Terminal
       if lines.length > @scrollback
         for line in Array.prototype.slice.call(
           lines, 0, lines.length - @scrollback)
-          line.remove()
+            line.remove()
         for group in document.querySelectorAll('.group:empty')
           group.remove()
         lines = document.querySelectorAll('.line')
@@ -1881,8 +1881,9 @@ class Terminal
         # invisible
         @curAttr.invisible = true
       else if p is 10
-         # Primary Font
+        # Primary Font
-         # ignoring
+        # ignoring
+        undefined
       else if p is 22
         # not bold
         @curAttr.bold = false
@@ -2486,7 +2487,7 @@ class Terminal
             @scrollBottom = @normal.scrollBottom
             @tabs = @normal.tabs
             @normal = null
-            @reset()
+            @refresh(true)
             @showCursor()
 
 

package.json

@@ -13,13 +13,13 @@
   },
   "homepage": "https://github.com/paradoxxxzero/butterfly",
   "devDependencies": {
-    "coffeelint": "^1.9.3",
+    "coffeelint": "^1.12.1",
     "grunt": "^0.4.5",
     "grunt-coffeelint": "0.0.13",
     "grunt-contrib-coffee": "^0.13.0",
-    "grunt-contrib-cssmin": "^0.12.2",
+    "grunt-contrib-cssmin": "^0.14.0",
-    "grunt-contrib-uglify": "^0.9.1",
+    "grunt-contrib-uglify": "^0.9.2",
     "grunt-contrib-watch": "^0.6.1",
-    "grunt-sass": "^0.18.1"
+    "grunt-sass": "^1.1.0-beta"
   }
 }