bug fixes, issues

Author: mkaminsky11

README.md

@@ -14,6 +14,9 @@ This is only the **FRONTEND**. There is also a backend component which is not op
 If you want to see the places where all of the _magic_ happens, take a look at `js/drive.js`, `js/sky.js`, and `js/tabs.js`. Enjoy!
 
 ### Recent Updates
++ Fix encoding bug to allow for non-latin characters (é, ï, etc.)
++ Switch between OneDrive and Google Drive
++ New color picker
 + Better publish function
 + Tree contents loaded asyncronously
 + Modes dynamically loaded, instead of all at once
@@ -32,16 +35,16 @@ If you want to see the places where all of the _magic_ happens, take a look at `
 + Copy files
 + Context menu in sidebar
 + Minimize and beautify
-+ ~~Warning when closing without saving changes~~ **DONE!**
-+ ~~Snippets (coming soon)~~ **DONE!**
++ ~~Warning when closing without saving changes~~
++ ~~Snippets~~
 + Fix running Javascript + Coffeescript
-+ ~~Import and export snippets~~ **DONE!**
-+ ~~Store open tabs and reload on open~~ **DONE!**
-+ ~~Dynamically load modes~~ **DONE!**
-+ Custom-made color picker (WIP)
++ ~~Import and export snippets~~
++ ~~Store open tabs and reload on open~~
++ ~~Dynamically load modes~~
++ ~~New color picker~~
 + Chat and collaboration using our backend, so that Onedrive users can chat and collaborate as well
-+ ~~Better publishing~~ **DONE!**
-+ ~~Remove Roboto font, use websafe font~~ **KEEP IT, LOADED VIA GOOGLE FONTS**
++ ~~Better publishing~~
++ ~~Roboto Font loaded faster~~
 
 ### Long-Term Goals
 + Improve user onboarding and visual interface

index.html

@@ -312,6 +312,11 @@ <h6>
   					</a>
   				</span>
   				<span class="side-run" onclick="run()"><i class="zmdi zmdi-play"></i>Run</span>
+  				<span>
+  					<a href=="https://codeyourcloud.com?sky=true" style="text-decoration: none" id="swap">
+	  					<i class="zmdi zmdi-swap"></i>Switch To OneDrive
+  					</a>
+  				</span>
   				<span>
   					<a href="https://accounts.google.com/logout" style="text-decoration: none;" id="log-out">
   						<i class="zmdi zmdi-square-right"></i>Log Out
@@ -514,6 +519,8 @@ <h5>Ctrl + F, &#8984; + F <span>Find</span></h5>
 			<i class="md zmdi zmdi-close" onclick="broadcast.close()"></i>
 		</div>
 
+		<iframe id="repl" style="display:none"></iframe>
+		
 		<!--context menu-->
 		<div id="context" class="popup context-menu">
 			<span onclick="" class="context-menu__item">
@@ -657,6 +664,7 @@ <h5>Ctrl + F, &#8984; + F <span>Find</span></h5>
 		<script src="js/tree.js"></script>
 		<script src="js/tabs.js"></script>
 		<script src="js/snippets.js"></script>
+		<script src="js/repl.js"></script>
 		<script src="js/ready.js"></script>
 
 

js/editor.js

@@ -60,7 +60,7 @@ manager.setFileTitle = function(id, title){
 }
 manager.save = function(id){
 	if(id !== "welcome"){
-		var content = getEditor(id).getValue()
+		var content = charToCode(getEditor(id).getValue());
 		if(typeof content !== "undefined"){ //if nothing is "null"
 			if(cloud_use === "drive"){
 		        var contentArray = new Array(content.length);
@@ -453,6 +453,14 @@ settings.init = function(){
     //
     //
     settings.state = prefs;
+    
+    settings.state.tabs = [];
+    for(var i = 0; i < prefs.tabs.length; i++){
+	    if(prefs.tabs[i].indexOf(cloud_use + "_") === 0){
+		    settings.state.tabs.push(prefs.tabs[i].replace(cloud_use + "_"));
+	    }
+    }
+    
     for(var i = 0; i < settings.state.tabs.length; i++){
 	    if(manager.isOpen(settings.state.tabs[i]) === false){
 		    addTab(settings.state.tabs[i], false);
@@ -462,9 +470,13 @@ settings.init = function(){
 }
 
 settings.change = function(){
+	var info = settings.state;
+	for(var i = 0; i < info.tabs.length; i++){
+		info.tabs[i] = cloud_use + "_" + info.tabs[i];
+	}
   $.ajax("https://codeyourcloud.com/prefs/change",{
 		method: "POST",
-		data: settings.state,
+		data: info,
 		success: function(data, textStatus, jqXHR){
 		},
 		error: function(jqXHR, textStatus, errorThrown){

js/frontend.js

@@ -86,17 +86,14 @@ connect.publish = function(content, mode, fileId){
 	if(mode === "text/x-markdown" || mode === "gfm"){
 		content = converter.makeHtml(content);
 	}
-	
 	var userId = null;
 	fileId = fileId.replace(/-/g, '');
-	
 	if(cloud_use === "drive"){
 		userId = drive.id;
 	}
 	else if(cloud_use === "sky"){
 		userId = sky.id;
 	}
-	
 	var info = {
 		mode: mode,
 		content: content,

js/global.js

@@ -200,3 +200,75 @@ function getParameterByName(name) {
 function esc(text){
   return $("#escape").text(text).html()
 }
+
+String.prototype.toUnicode = function(){
+    var result = "";
+    for(var i = 0; i < this.length; i++){
+        result += "\\u" + ("000" + this[i].charCodeAt(0).toString(16)).substr(-4);
+    }
+    return result;
+};
+
+function knownCharCodeAt(str, idx) {
+  str += '';
+  var code,
+      end = str.length;
+  var surrogatePairs = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g;
+  while ((surrogatePairs.exec(str)) != null) {
+    var li = surrogatePairs.lastIndex;
+    if (li - 2 < idx) {
+      idx++;
+    }
+    else {
+      break;
+    }
+  }
+  if (idx >= end || idx < 0) {
+    return NaN;
+  }
+  code = str.charCodeAt(idx);
+  var hi, low;
+  if (0xD800 <= code && code <= 0xDBFF) {
+    hi = code;
+    low = str.charCodeAt(idx + 1);
+    // Go one further, since one of the "characters" is part of a surrogate pair
+    return ((hi - 0xD800) * 0x400) + (low - 0xDC00) + 0x10000;
+  }
+  return code;
+}
+
+function encode_utf8(s) {
+  return unescape(encodeURIComponent(s));
+}
+
+function decode_utf8(s) {
+  return decodeURIComponent(escape(s));
+}
+
+function codeToChar(text){
+	var newText = text.replace(/\\u[0-9a-z][0-9a-z][0-9a-z][0-9a-z]/g, 
+	    function($0, $1) {
+	        return String.fromCharCode(knownCharCodeAt("" + $1), 0);
+	    }
+	);
+	return newText;
+}
+
+function charToCode(text){
+	text = text.split("");
+	for(var i = 0; i < text.length; i++){
+		if(/[^\u0000-\u007F]+/g.test(text[i]) === true){
+			var item = text[i];
+			text[i] = "";
+			if(i < (text.length - 1)){
+				text[i + 1] =  item.toUnicode() + text[i +1];
+			}
+			else{
+				text = text.reverse();
+				text.push(item.toUnicode());
+				text = text.reverse();
+			}
+		}
+	}
+	return text.join("");
+}

js/logic/com.js

@@ -2,6 +2,14 @@ window.addEventListener("message", receiveMessage, false);
 
 var _change = 0;
 
+function encode_utf8(s) {
+  return unescape(encodeURIComponent(s));
+}
+
+function decode_utf8(s) {
+  return decodeURIComponent(escape(s));
+}
+
 function receiveMessage(event){
   if(event.data !== "!_{h:''}"){
   	var json = JSON.parse(event.data);
@@ -18,11 +26,12 @@ function receiveMessage(event){
 	  	makeChat(json.message, json.name, json.id, json.photo);
   	}
   	else if(json.type === "text"){
+  	  console.log(json.text);
   		try{
-		  	text.setText(json.text);
-		}
-		catch(e){
-		}
+		  	text.setText(decode_utf8(json.text));
+  		}
+  		catch(e){
+  		}
   	}
   }
 }
@@ -39,9 +48,10 @@ function sendData(data){
 }
 
 function setValue(value){
+	console.log(value);
 	sendData({
 		type: "text",
-		value: value,
+		value: encode_utf8(value),
 		currentfile: current_file
 	});
 }
@@ -67,7 +77,7 @@ function removeUser(the_id){
 }
 
 function setText(value){
-	text.setText(value);
+	text.setText(decode_utf8(value));
 }
 
 function insertChat(the_message, the_name, is_you, the_photo, is_new){
@@ -86,7 +96,7 @@ function insert_text(point, text){
 	sendData({
 		type: "insert_text",
 		point: point,
-		text: text,
+		text: encode_utf8(text),
 		currentfile: current_file
 	});
 }

js/ready.js

@@ -40,12 +40,12 @@ $(document).ready(function(){
 	broadcast.init();
 	connect.init();
 	context.init();
-	snippets.init(); //<----later
+	snippets.init();
+	repl.init();
 
 	//===========
 	//SAVE DIALOG
 	//===========
-	window.onmessage = repl.onmessage;
 	window.onbeforeunload = function(){
 		if(manager.allSaved() === false){
 			return "You have unsaved work. Do you really want to quit?"

js/realtime.js

@@ -19,7 +19,6 @@ function loadSky(){
 function init(){
 	if(_init === false){
 		_init = true;
-		//decide wether to load sky or drive
 		drive.checkAppLogin(function(_logged_in, _acct_data){
 			true_id = _acct_data.user._id;
 			$("#loading-bar").css("width","10%");
@@ -46,7 +45,6 @@ function init(){
 					}
 				}
 				else if(window.location.href.indexOf("?drive=true") !== -1 || window.location.href.indexOf("%22action%22:%22") !== -1 || window.location.href.indexOf("#state=/profile&access_token=") !== -1){
-					//indication of drive
 					if(drive.logged_in === true){
 						//all good!
 						$("#loading-bar").css("width","30%");
@@ -61,15 +59,13 @@ function init(){
 				else{
 					//no indication
 					if(drive.logged_in === true && sky.logged_in === false){
-						//all good!
 						$("#loading-bar").css("width","30%");
 					}
 					else if(drive.logged_in === false && sky.logged_in === true){
 						cloud_use = "sky";
 						$("#loading-bar").css("width","30%");
 					}
 					else if(drive.logged_in === true && sky.logged_in === true){
-						//all good! -> prioritize drive
 						$("#loading-bar").css("width","30%");
 					}
 					else{
@@ -79,8 +75,6 @@ function init(){
 						}
 					}
 				}
-				
-				
 				if(cloud_use === "drive"){
 					drive.loadClient();
 				}

js/repl.js

@@ -0,0 +1,11 @@
+var repl = {};
+repl.send = function(send){
+	repl.elem.contentWindow.postMessage(JSON.stringify(send), '*');
+}
+repl.onmessage = function(e){
+	//console.log(JSON.parse(e.data));
+}
+repl.init = function(){
+		window.onmessage = repl.onmessage;
+		repl.elem = document.getElementById("repl");
+}

js/sky.js

@@ -42,6 +42,8 @@ sky.loadClient = function(){
 	$("#help_button").remove();
 	$(".share-button").remove();
 	$("#log-out").attr("href", sky.logout_url);
+	$("#swap").attr("href", "https://codeyourcloud.com?drive=true");
+	$("#swap").html( $("#swap").html().replace("Switch To OneDrive", "Switch To Google Drive") );
 	sky.getInfo();
 }