Merge pull request #432 from owncloud/broken-title

Fix broken title in some cases

js/3rdparty/resources/dojox/html/entities.js

@@ -0,0 +1,77 @@
+//>>built
+define("dojox/html/entities",["dojo/_base/lang"],function(_1){
+var _2=_1.getObject("dojox.html.entities",true);
+var _3=function(_4,_5){
+var _6,_7;
+if(_5._encCache&&_5._encCache.regexp&&_5._encCache.mapper&&_5.length==_5._encCache.length){
+_6=_5._encCache.mapper;
+_7=_5._encCache.regexp;
+}else{
+_6={};
+_7=["["];
+var i;
+for(i=0;i<_5.length;i++){
+_6[_5[i][0]]="&"+_5[i][1]+";";
+_7.push(_5[i][0]);
+}
+_7.push("]");
+_7=new RegExp(_7.join(""),"g");
+_5._encCache={mapper:_6,regexp:_7,length:_5.length};
+}
+_4=_4.replace(_7,function(c){
+return _6[c];
+});
+return _4;
+};
+var _8=function(_9,_a){
+var _b,_c;
+if(_a._decCache&&_a._decCache.regexp&&_a._decCache.mapper&&_a.length==_a._decCache.length){
+_b=_a._decCache.mapper;
+_c=_a._decCache.regexp;
+}else{
+_b={};
+_c=["("];
+var i;
+for(i=0;i<_a.length;i++){
+var e="&"+_a[i][1]+";";
+if(i){
+_c.push("|");
+}
+_b[e]=_a[i][0];
+_c.push(e);
+}
+_c.push(")");
+_c=new RegExp(_c.join(""),"g");
+_a._decCache={mapper:_b,regexp:_c,length:_a.length};
+}
+_9=_9.replace(_c,function(c){
+return _b[c];
+});
+return _9;
+};
+_2.html=[["&","amp"],["\"","quot"],["<","lt"],[">","gt"],[" ","nbsp"]];
+_2.latin=[["¡","iexcl"],["¢","cent"],["£","pound"],["€","euro"],["¤","curren"],["¥","yen"],["¦","brvbar"],["§","sect"],["¨","uml"],["©","copy"],["ª","ordf"],["«","laquo"],["¬","not"],["­","shy"],["®","reg"],["¯","macr"],["°","deg"],["±","plusmn"],["²","sup2"],["³","sup3"],["´","acute"],["µ","micro"],["¶","para"],["·","middot"],["¸","cedil"],["¹","sup1"],["º","ordm"],["»","raquo"],["¼","frac14"],["½","frac12"],["¾","frac34"],["¿","iquest"],["À","Agrave"],["Á","Aacute"],["Â","Acirc"],["Ã","Atilde"],["Ä","Auml"],["Å","Aring"],["Æ","AElig"],["Ç","Ccedil"],["È","Egrave"],["É","Eacute"],["Ê","Ecirc"],["Ë","Euml"],["Ì","Igrave"],["Í","Iacute"],["Î","Icirc"],["Ï","Iuml"],["Ð","ETH"],["Ñ","Ntilde"],["Ò","Ograve"],["Ó","Oacute"],["Ô","Ocirc"],["Õ","Otilde"],["Ö","Ouml"],["×","times"],["Ø","Oslash"],["Ù","Ugrave"],["Ú","Uacute"],["Û","Ucirc"],["Ü","Uuml"],["Ý","Yacute"],["Þ","THORN"],["ß","szlig"],["à","agrave"],["á","aacute"],["â","acirc"],["ã","atilde"],["ä","auml"],["å","aring"],["æ","aelig"],["ç","ccedil"],["è","egrave"],["é","eacute"],["ê","ecirc"],["ë","euml"],["ì","igrave"],["í","iacute"],["î","icirc"],["ï","iuml"],["ð","eth"],["ñ","ntilde"],["ò","ograve"],["ó","oacute"],["ô","ocirc"],["õ","otilde"],["ö","ouml"],["÷","divide"],["ø","oslash"],["ù","ugrave"],["ú","uacute"],["û","ucirc"],["ü","uuml"],["ý","yacute"],["þ","thorn"],["ÿ","yuml"],["ƒ","fnof"],["Α","Alpha"],["Β","Beta"],["Γ","Gamma"],["Δ","Delta"],["Ε","Epsilon"],["Ζ","Zeta"],["Η","Eta"],["Θ","Theta"],["Ι","Iota"],["Κ","Kappa"],["Λ","Lambda"],["Μ","Mu"],["Ν","Nu"],["Ξ","Xi"],["Ο","Omicron"],["Π","Pi"],["Ρ","Rho"],["Σ","Sigma"],["Τ","Tau"],["Υ","Upsilon"],["Φ","Phi"],["Χ","Chi"],["Ψ","Psi"],["Ω","Omega"],["α","alpha"],["β","beta"],["γ","gamma"],["δ","delta"],["ε","epsilon"],["ζ","zeta"],["η","eta"],["θ","theta"],["ι","iota"],["κ","kappa"],["λ","lambda"],["μ","mu"],["ν","nu"],["ξ","xi"],["ο","omicron"],["π","pi"],["ρ","rho"],["ς","sigmaf"],["σ","sigma"],["τ","tau"],["υ","upsilon"],["φ","phi"],["χ","chi"],["ψ","psi"],["ω","omega"],["ϑ","thetasym"],["ϒ","upsih"],["ϖ","piv"],["•","bull"],["…","hellip"],["′","prime"],["″","Prime"],["‾","oline"],["⁄","frasl"],["℘","weierp"],["ℑ","image"],["ℜ","real"],["™","trade"],["ℵ","alefsym"],["←","larr"],["↑","uarr"],["→","rarr"],["↓","darr"],["↔","harr"],["↵","crarr"],["⇐","lArr"],["⇑","uArr"],["⇒","rArr"],["⇓","dArr"],["⇔","hArr"],["∀","forall"],["∂","part"],["∃","exist"],["∅","empty"],["∇","nabla"],["∈","isin"],["∉","notin"],["∋","ni"],["∏","prod"],["∑","sum"],["−","minus"],["∗","lowast"],["√","radic"],["∝","prop"],["∞","infin"],["∠","ang"],["∧","and"],["∨","or"],["∩","cap"],["∪","cup"],["∫","int"],["∴","there4"],["∼","sim"],["≅","cong"],["≈","asymp"],["≠","ne"],["≡","equiv"],["≤","le"],["≥","ge"],["⊂","sub"],["⊃","sup"],["⊄","nsub"],["⊆","sube"],["⊇","supe"],["⊕","oplus"],["⊗","otimes"],["⊥","perp"],["⋅","sdot"],["⌈","lceil"],["⌉","rceil"],["⌊","lfloor"],["⌋","rfloor"],["〈","lang"],["〉","rang"],["◊","loz"],["♠","spades"],["♣","clubs"],["♥","hearts"],["♦","diams"],["Œ","OElig"],["œ","oelig"],["Š","Scaron"],["š","scaron"],["Ÿ","Yuml"],["ˆ","circ"],["˜","tilde"],[" ","ensp"],[" ","emsp"],[" ","thinsp"],["‌","zwnj"],["‍","zwj"],["‎","lrm"],["‏","rlm"],["–","ndash"],["—","mdash"],["‘","lsquo"],["’","rsquo"],["‚","sbquo"],["“","ldquo"],["”","rdquo"],["„","bdquo"],["†","dagger"],["‡","Dagger"],["‰","permil"],["‹","lsaquo"],["›","rsaquo"]];
+_2.encode=function(_d,m){
+if(_d){
+if(!m){
+_d=_3(_d,_2.html);
+_d=_3(_d,_2.latin);
+}else{
+_d=_3(_d,m);
+}
+}
+return _d;
+};
+_2.decode=function(_e,m){
+if(_e){
+if(!m){
+_e=_8(_e,_2.html);
+_e=_8(_e,_2.latin);
+}else{
+_e=_8(_e,m);
+}
+}
+return _e;
+};
+return _2;
+});

js/widgets/titleBar.js

@@ -1,7 +1,7 @@
 /*global define,require */
 define("owncloud/widgets/titleBar",
-		["dojo/_base/declare", "dijit/_WidgetBase", "dijit/_TemplatedMixin", "webodf/editor/EditorSession"],
-		function (declare, _WidgetBase, _TemplatedMixin, EditorSession) {
+		["dojo/_base/declare", "dijit/_WidgetBase", "dijit/_TemplatedMixin", "dojox/html/entities", "webodf/editor/EditorSession"],
+		function (declare, _WidgetBase, _TemplatedMixin, Entities, EditorSession) {
 			return declare("TitleBar", [_WidgetBase, _TemplatedMixin], {
 				title : '',
 				templateString:
@@ -10,7 +10,7 @@ define("owncloud/widgets/titleBar",
 					'</div>',
 				buildRendering: function () {
 					// FixMe: this should not be global
-					this.title = documentsMain.fileName;
+					this.title = Entities.encode(documentsMain.fileName);
 					this.inherited(arguments);
 				},
 				showRenamePrompt: function () {