From 602b6fffae08d1a6e2282b31cd1fe581eb32d6e1 Mon Sep 17 00:00:00 2001
From: hallgren <hallgren@chalmers.se>
Date: Thu, 21 May 2015 08:00:49 +0000
Subject: [PATCH] Fixed a problem with minibar when invoked from gfse or the
 syntax editor

Minibar needs js/langcode.js now, so need to include it in gfse/index.html
and syntax-exitor/editor.html too.
---
 src/www/gfse/editor.js            | 23 +++++++++--------
 src/www/gfse/index.html           |  3 ++-
 src/www/js/langcode.js            | 42 ++++++++++++++++++-------------
 src/www/syntax-editor/editor.html |  1 +
 4 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/src/www/gfse/editor.js b/src/www/gfse/editor.js
index 09ae339e4..12606a1a8 100644
--- a/src/www/gfse/editor.js
+++ b/src/www/gfse/editor.js
@@ -571,17 +571,20 @@ function quiz_button(g,err_ind) {
 }
 
 
-function lang(code,name) { return { code:code, name:name} }
-function lang1(name) {
-    var ws=name.split("/");
-    return ws.length==1 ? lang(name.substr(0,3),name) : lang(ws[0],ws[1]);
-}
-
-// Language names and 3-letter ISO-639 codes
-// See http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
 var languages =
-    map(lang1,"Amharic Arabic Bulgarian Catalan Chinese Danish Dutch English Estonian Finnish French German Greek Hindi Ina/Interlingua Italian Jpn/Japanese Latin Mlt/Maltese Mongolian Norwegian Pes/Persian Polish Pnb/Punjabi Ron/Romanian Russian Snd/Sindhi Spanish Swedish Thai Turkish Urdu".split(" "));
-languages.push(lang("Other","Other"));
+    function() {
+	function lang(code,name) { return { code:code, name:name} }
+	function lang1(name) {
+	    var ws=name.split("/");
+	    return ws.length==1 ? lang(name.substr(0,3),name) : lang(ws[0],ws[1]);
+	}
+
+	// Language names and 3-letter ISO-639 codes
+	// See http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+	var languages=map(lang1,"Amharic Arabic Bulgarian Catalan Chinese Danish Dutch English Estonian Finnish French German Greek Hindi Ina/Interlingua Italian Jpn/Japanese Latin Mlt/Maltese Mongolian Norwegian Pes/Persian Polish Pnb/Punjabi Ron/Romanian Russian Snd/Sindhi Spanish Swedish Thai Turkish Urdu".split(" "));
+	languages.push(lang("Other","Other"));
+	return languages
+    }()
 
 var langname={};
 for(var i in languages)
diff --git a/src/www/gfse/index.html b/src/www/gfse/index.html
index 0eb76be46..4fa291242 100644
--- a/src/www/gfse/index.html
+++ b/src/www/gfse/index.html
@@ -34,7 +34,7 @@ This page does not work without JavaScript.
 <hr>
 <div class=modtime><small>
 HTML
-<!-- hhmts start -->Last modified: Tue Apr 23 14:05:30 CEST 2013 <!-- hhmts end -->
+<!-- hhmts start -->Last modified: Thu May 21 09:47:39 CEST 2015 <!-- hhmts end -->
 </small></div>
 <a href="about.html">About</a>
 <pre id=debug></pre>
@@ -42,6 +42,7 @@ HTML
 <script type="text/javascript" src="../js/support.js"></script>
 <script type="text/JavaScript" src="../js/pgf_online.js"></script>
 <script type="text/javascript" src="../js/localstorage.js"></script>
+<script type="text/JavaScript" src="../js/langcode.js"></script>
 
 <script type="text/javascript" src="localstorage.js"></script>
 <script type="text/javascript" src="gf_abs.js"></script>
diff --git a/src/www/js/langcode.js b/src/www/js/langcode.js
index e89b08319..627c7a0e0 100644
--- a/src/www/js/langcode.js
+++ b/src/www/js/langcode.js
@@ -1,25 +1,31 @@
 // Language names and ISO-639 codes (both 3-letter and 2-letter codes)
 // See http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
 
-function lang1(namecode2) {
-    function lang(code,name,code2) {return {code:code, name:name, code2:code2}}
-    var nc=namecode2.split(":")
-    var name=nc[0]
-    var ws=name.split("/")
-    var code2=nc.length>1 ? nc[1] : ""
-    return ws.length==1 ? lang(name.substr(0,3),name,code2)
-	                : lang(ws[0],ws[1],code2)
-}
+var languages =
+    function() {
+	function lang1(namecode2) {
+	    function lang(code,name,code2) {
+		return {code:code, name:name, code2:code2}
+	    }
+	    var nc=namecode2.split(":")
+	    var name=nc[0]
+	    var ws=name.split("/")
+	    var code2=nc.length>1 ? nc[1] : ""
+	    return ws.length==1 ? lang(name.substr(0,3),name,code2)
+	                        : lang(ws[0],ws[1],code2)
+	}
 
-var languages = // [ISO-639-2 code "/"] language name ":" ISO 639-1 code
-    map(lang1,["Amharic:am","Arabic:ar","Bulgarian:bg","Catalan:ca",
-	       "Chinese:zh","Danish:da","Dutch:nl","English:en","Estonian:et",
-	       "Finnish:fi","French:fr","German:de","Greek:el","Hindi:hi",
-	       "Ina/Interlingua:ia","Italian:it","Jpn/Japanese:ja","Latin:la",
-	       "Norwegian:nb","Pes/Persian:fa","Polish:pl","Pnb/Punjabi:pa",
-	       "Ron/Romanian:ro","Russian:ru","Spanish:es","Swedish:sv",
-	       "Thai:th","Turkish:tr","Urdu:ur"])
-// GF uses nonstd 3-letter codes? Pes/Persian:fa, Pnb/Punjabi:pa
+	return map(lang1,
+		// [ISO-639-2 code "/"] language name ":" ISO 639-1 code
+		["Amharic:am","Arabic:ar","Bulgarian:bg","Catalan:ca",
+	        "Chinese:zh","Danish:da","Dutch:nl","English:en","Estonian:et",
+	        "Finnish:fi","French:fr","German:de","Greek:el","Hindi:hi",
+	        "Ina/Interlingua:ia","Italian:it","Jpn/Japanese:ja","Latin:la",
+	        "Norwegian:nb","Pes/Persian:fa","Polish:pl","Pnb/Punjabi:pa",
+	        "Ron/Romanian:ro","Russian:ru","Spanish:es","Swedish:sv",
+	        "Thai:th","Turkish:tr","Urdu:ur"])
+	        // GF uses nonstd 3-letter codes? Pes/Persian:fa, Pnb/Punjabi:pa
+    }()
 
 var langname={}
 var langcode2={}
diff --git a/src/www/syntax-editor/editor.html b/src/www/syntax-editor/editor.html
index 8ebc9a919..558c457ad 100644
--- a/src/www/syntax-editor/editor.html
+++ b/src/www/syntax-editor/editor.html
@@ -26,6 +26,7 @@
   <script type="text/javascript" src="../js/support.js"></script>
   <script type="text/JavaScript" src="../js/localstorage.js"></script>
   <script type="text/javascript" src="../js/pgf_online.js"></script>
+  <script type="text/JavaScript" src="../js/langcode.js"></script>
 
   <!-- Editor -->
   <script type="text/javascript" src="ast.js"></script>