fixed merge conflicts

static/js/pad2.js

@@ -17,21 +17,14 @@
 /* global $, window */
 
 var socket;
+var LineNumbersDisabled = false;
+var globalUserName = false;
 
 $(document).ready(function()
 {
-  //test if the url is proper, means without any ? or # that doesn't belong to a url
-  //if it isn't proper, clean the url a do a redirect
-  var padId = document.location.pathname.substring(document.location.pathname.lastIndexOf("/") + 1);  
-  var expectedURL = document.location.href.substring(0,document.location.href.lastIndexOf("/") ) + "/" + padId;
-  if(expectedURL != document.location.href)
-  {
-    document.location = expectedURL;
-  }
-
   //start the costum js
   if(typeof costumStart == "function") costumStart();
-
+  getParams();
   handshake();
 });
 
@@ -78,6 +71,57 @@ function randomString()
   return "t." + randomstring;
 }
 
+function getParams()
+{
+  var showControls = getUrlVars()["showControls"];
+  var showChat = getUrlVars()["showChat"];
+  var userName = getUrlVars()["userName"];
+  var showLineNumbers = getUrlVars()["showLineNumbers"];
+  if(showControls)
+  {
+    if(showControls == "false")
+    { 
+      $('#editbar').hide();
+      $('#editorcontainer').css({"top":"0px"});
+    }
+  }
+
+  if(showChat)
+  {
+    if(showChat == "false")
+    {
+      $('#chaticon').hide();
+    }
+  }
+
+  if(showLineNumbers)
+  {
+    if(showLineNumbers == "false")
+    {
+      LineNumbersDisabled = true;
+    }
+  }
+
+  if(userName)
+  {
+    // If the username is set as a parameter we should set a global value that we can call once we have initiated the pad.
+    globalUserName = userName;
+  }
+}
+
+function getUrlVars()
+{
+  var vars = [], hash;
+  var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+  for(var i = 0; i < hashes.length; i++)
+  {
+    hash = hashes[i].split('=');
+    vars.push(hash[0]);
+    vars[hash[0]] = hash[1];
+  }
+  return vars;
+}
+
 function handshake()
 {
   var loc = document.location;
@@ -95,7 +139,6 @@ function handshake()
   socket.once('connect', function()
   {
     var padId = document.location.pathname.substring(document.location.pathname.lastIndexOf("/") + 1);
-    
     document.title = document.title + " | " + padId;
 
     var token = readCookie("token");
@@ -115,7 +158,6 @@ function handshake()
       "token": token,
       "protocolVersion": 2
     };
-
     socket.json.send(msg);
   });
 
@@ -136,8 +178,21 @@ function handshake()
       clientVars.collab_client_vars.clientAgent = "Anonymous";
 
       pad.init();
-
       initalized = true;
+
+      // If the LineNumbersDisabled value is set to true then we need to hide the Line Numbers
+      if (LineNumbersDisabled == true)
+      {
+        pad.changeViewOption('showLineNumbers', false);
+      }
+
+      // if the globalUserName value is set we need to tell the server and the client about the new authorname
+      if (globalUserName !== false)
+      {
+        pad.notifyChangeName(globalUserName); // Notifies the server
+        $('#myusernameedit').attr({"value":globalUserName}); // Updates the current users UI
+      }
+
     }
     //This handles every Message after the clientVars
     else
@@ -351,12 +406,15 @@ var pad = {
     };
     options.view[key] = value;
     pad.handleOptionsChange(options);
-    pad.collabClient.sendClientMessage(
+    if (key != "showLineNumbers")
     {
-      type: 'padoptions',
-      options: options,
-      changedBy: pad.myUserInfo.name || "unnamed"
-    });
+      pad.collabClient.sendClientMessage(
+      {
+        type: 'padoptions',
+        options: options,
+        changedBy: pad.myUserInfo.name || "unnamed"
+      });
+    }
   },
   handleOptionsChange: function(opts)
   {