fix merge errors and reach full jshint compliance

2016-10-04 16:58:10 +02:00
parent a30e17121d
commit dbc8f01b8b
7 changed files with 56 additions and 51 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -47,8 +47,6 @@ define([
        var host = window.location.host;
        var url = protocol + '//' + host + path;

-        console.log(url);
-
        return url;
    };

@@ -797,7 +795,7 @@ define([
                });
        }
        if (rightside) {
-            button.addClass('rightside-button')
+            button.addClass('rightside-button');
        }
        return button;
    };