Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:hybridgroup/kidsruby

  • Loading branch information...
commit e6624094c8599259fe67dbe87530741cb72f4a07 2 parents 69ce3cd + 0fd7550
@deadprogram deadprogram authored
Showing with 3 additions and 1 deletion.
  1. +2 −0  app/widgets/main.rb
  2. +1 −1  public/js/app.js
View
2  app/widgets/main.rb 100644 → 100755
@@ -124,6 +124,7 @@ def openRubyFile(nada)
while !inf.atEnd()
line = escape_for_open(inf.readLine())
+ line.force_encoding("UTF-8")
@frame.evaluateJavaScript("addCode('#{line}');")
end
end
@@ -140,6 +141,7 @@ def saveRubyFile(code)
end
outf = Qt::TextStream.new(file)
+ code.force_encoding("UTF-8")
outf << code
outf.flush
end
View
2  public/js/app.js
@@ -215,7 +215,7 @@ function loadLanguage(lang){
error: function(x, s, t) {
// handles special case for windows webkit
if (x.status == 0) {
- localizeUI(x.responseText);
+ localizeUI($.parseJSON(x.responseText));
}
}
});
Please sign in to comment.
Something went wrong with that request. Please try again.