From 34500b3255ec1d5a63e23a413378bcc12517e35b Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Sun, 10 Aug 2014 19:44:53 -0400
Subject: [PATCH] little fix for Util.splitLine

---
 app/assets/javascripts/metamaps/Metamaps.js | 2 +-
 config/application.rb                       | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/assets/javascripts/metamaps/Metamaps.js b/app/assets/javascripts/metamaps/Metamaps.js
index b3d3b2b6..a069af54 100644
--- a/app/assets/javascripts/metamaps/Metamaps.js
+++ b/app/assets/javascripts/metamaps/Metamaps.js
@@ -1265,7 +1265,7 @@ Metamaps.Util = {
     // you may copy this code but please keep the copyright notice as well
     splitLine: function (st, n) {
         var b = '';
-        var s = st;
+        var s = st ? st : '';
         while (s.length > n) {
             var c = s.substring(0, n);
             var d = c.lastIndexOf(' ');
diff --git a/config/application.rb b/config/application.rb
index d84d0c62..d9f5f0f1 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -54,8 +54,6 @@ module Metamaps
     config.assets.enabled = true
     config.assets.initialize_on_precompile = false
       
-    config.assets.paths << "#{Rails.root}/app/assets/javascripts/src"
-
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '2.0'
   end