1.1.5 optimize js and css

build.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+compass compile --force -e production butterfly/static
+coffee -cb -j butterfly/static/javascripts/main.js \
+    butterfly/static/coffees/term.coffee \
+    butterfly/static/coffees/selection.coffee \
+    butterfly/static/coffees/virtual_input.coffee \
+    butterfly/static/coffees/main.coffee
+uglifyjs butterfly/static/javascripts/main.js -c -m > butterfly/static/javascripts/main.js

butterfly/__init__.py

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-__version__ = '1.1.4'
+__version__ = '1.1.5'
 
 
 import os

butterfly/static/coffees/selection.coffee

@@ -162,8 +162,8 @@ class Selection
 document.addEventListener 'keydown', (e) ->
     return true if e.keyCode in [16..19]
 
-    # Paste natural selection too
-    if e.keyCode is 13 and not selection and not getSelection().isCollapsed
+    # Paste natural selection too if shiftkey
+    if e.shiftKey and e.keyCode is 13 and not selection and not getSelection().isCollapsed
         term.handler getSelection().toString()
         getSelection().removeAllRanges()
         return cancel e

butterfly/static/coffees/term.coffee

@@ -107,7 +107,7 @@ class Terminal
         # Horrible Firefox paste workaround
         if typeof InstallTrigger isnt "undefined"
             @element.contentEditable = 'true'
-            @element.addEventListener "mouseup", (ev) =>
+            @element.addEventListener "mouseup", =>
                 sel = getSelection().getRangeAt(0)
                 if sel.startOffset is sel.endOffset
                     getSelection().removeAllRanges()