Changelog

Apply uri-root-path change to coffee/sass files and regenerate.

CHANGELOG.md

@@ -1,3 +1,9 @@
+[3.2.5](https://github.com/paradoxxxzero/butterfly/compare/3.2.4...3.2.5)
+=====
+
+* Fix #155 again (PR #179)
+
+
 [3.2.4](https://github.com/paradoxxxzero/butterfly/compare/3.2.3...3.2.4)
 =====
 

butterfly/__about__.py

@@ -1,5 +1,5 @@
 __title__ = "butterfly"
-__version__ = "3.2.4"
+__version__ = "3.2.5"
 
 __summary__ = "A sleek web based terminal emulator"
 __uri__ = "https://github.com/paradoxxxzero/butterfly"

butterfly/sass/_font.sass

@@ -23,7 +23,7 @@ $weights: (ExtraLight 100) (Light 300) (Regular 400) (Medium 500) (Semibold 600)
 
     @font-face
       font-family: "SourceCodePro"
-      src: url("/static/fonts/SourceCodePro-#{$weight_name}.otf") format("woff")
+      src: url("fonts/SourceCodePro-#{$weight_name}.otf") format("woff")
       font-weight: nth($weight, 2)
 
 body

butterfly/static/main.css

@@ -70,37 +70,37 @@
 /* along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 @font-face {
   font-family: "SourceCodePro";
-  src: url("/static/fonts/SourceCodePro-ExtraLight.otf") format("woff");
+  src: url("fonts/SourceCodePro-ExtraLight.otf") format("woff");
   font-weight: 100; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("/static/fonts/SourceCodePro-Light.otf") format("woff");
+  src: url("fonts/SourceCodePro-Light.otf") format("woff");
   font-weight: 300; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("/static/fonts/SourceCodePro-Regular.otf") format("woff");
+  src: url("fonts/SourceCodePro-Regular.otf") format("woff");
   font-weight: 400; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("/static/fonts/SourceCodePro-Medium.otf") format("woff");
+  src: url("fonts/SourceCodePro-Medium.otf") format("woff");
   font-weight: 500; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("/static/fonts/SourceCodePro-Semibold.otf") format("woff");
+  src: url("fonts/SourceCodePro-Semibold.otf") format("woff");
   font-weight: 600; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("/static/fonts/SourceCodePro-Bold.otf") format("woff");
+  src: url("fonts/SourceCodePro-Bold.otf") format("woff");
   font-weight: 700; }
 
 @font-face {
   font-family: "SourceCodePro";
-  src: url("/static/fonts/SourceCodePro-Black.otf") format("woff");
+  src: url("fonts/SourceCodePro-Black.otf") format("woff");
   font-weight: 900; }
 
 body {

butterfly/static/main.js

@@ -24,11 +24,12 @@
       wsUrl = 'ws://';
     }
     rootPath = document.body.getAttribute('data-root-path');
+    rootPath = rootPath.replace(/^\/+|\/+$/g, '');
     if (rootPath.length) {
       rootPath = "/" + rootPath;
     }
     wsUrl += document.location.host + rootPath;
-    path = location.pathname;
+    path = '/';
     if (path.indexOf('/session') < 0) {
       path += "session/" + (document.body.getAttribute('data-session-token'));
     }

coffees/main.coffee

@@ -34,11 +34,12 @@ document.addEventListener 'DOMContentLoaded', ->
     wsUrl = 'ws://'
 
   rootPath = document.body.getAttribute('data-root-path')
+  rootPath = rootPath.replace(/^\/+|\/+$/g, '')
   if rootPath.length
     rootPath = "/#{rootPath}"
 
   wsUrl += document.location.host + rootPath
-  path = location.pathname
+  path = '/'
   if path.indexOf('/session') < 0
     path += "session/#{document.body.getAttribute('data-session-token')}"