Merge remote-tracking branch 'upstream/pull/4451'

[rails.git] / app / assets / javascripts / application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index f3ca5f37f463898b2412a83ab07298279f46059e..0bfff869ebcc87186c1aec12c4a0ff75949a923f 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -68,14 +68,6 @@ window.updateLinks = function (loc, zoom, layers, object) {
     .toggleClass("disabled", editDisabled);
 };
 
     .toggleClass("disabled", editDisabled);
 };
 

-window.maximiseMap = function () {
-  $("#content").addClass("maximised");
-};
-
-window.minimiseMap = function () {
-  $("#content").removeClass("maximised");
-};
-

 $(document).ready(function () {
   var headerWidth = 0,
       compactWidth = 0;
 $(document).ready(function () {
   var headerWidth = 0,
       compactWidth = 0;


@@ -111,6 +103,8 @@ $(document).ready(function () {
 
     $("body").removeClass("compact-nav");
 
 
     $("body").removeClass("compact-nav");
 

+    $("header").removeClass("text-nowrap");
+

     updateHeader();
 
     $(window).resize(updateHeader);
     updateHeader();
 
     $(window).resize(updateHeader);


@@ -132,6 +126,7 @@ $(document).ready(function () {
   I18n.fallbacks = true;
 
   OSM.preferred_editor = application_data.preferredEditor;
   I18n.fallbacks = true;
 
   OSM.preferred_editor = application_data.preferredEditor;

+  OSM.preferred_languages = application_data.preferredLanguages;

 
   if (application_data.user) {
     OSM.user = application_data.user;
 
   if (application_data.user) {
     OSM.user = application_data.user;