Merge branch 'master' into manual-chapter2

dev
Bartosz Leper 2015-09-20 17:42:50 +02:00
commit ecdf40099b
6 zmienionych plików z 1323 dodań i 5 usunięć

4
gui.js
Wyświetl plik

@ -70,7 +70,7 @@ SpeechBubbleMorph, ScriptFocusMorph*/
// Global stuff //////////////////////////////////////////////////////// // Global stuff ////////////////////////////////////////////////////////
modules.gui = '2015-July-28'; modules.gui = '2015-September-07';
// Declarations // Declarations
@ -5121,7 +5121,7 @@ ProjectDialogMorph.prototype.shareProject = function () {
encodeURIComponent(usr.toLowerCase()) + encodeURIComponent(usr.toLowerCase()) +
'&ProjectName=' + '&ProjectName=' +
encodeURIComponent(proj.ProjectName); encodeURIComponent(proj.ProjectName);
location.hash = projectId; location.hash = 'present:' + projectId;
} }
}, },
myself.ide.cloudError() myself.ide.cloudError()

Wyświetl plik

@ -2568,3 +2568,8 @@ ______
150814 150814
------ ------
* Blocks: fixed #907 * Blocks: fixed #907
150915
------
* new Croatian translation. Yay!! Thanks, Zeljko Hrvoj!
* fixed #925

1301
lang-hr.js 100755

Plik diff jest za duży Load Diff

Wyświetl plik

@ -42,7 +42,7 @@
/*global modules, contains*/ /*global modules, contains*/
modules.locale = '2015-August-06'; modules.locale = '2015-September-15';
// Global stuff // Global stuff
@ -511,3 +511,14 @@ SnapTranslator.dict.ia = {
'last_changed': 'last_changed':
'2015-08-09' '2015-08-09'
}; };
SnapTranslator.dict.hr = {
'language_name':
'Hrvatski',
'language_translator':
'\u017Deljko Hrvoj',
'translator_e-mail':
'zeljko.hrvoj@zg.t-com.hr',
'last_changed':
'2015-09-15'
};

Wyświetl plik

@ -83,7 +83,7 @@ ArgLabelMorph, localize, XML_Element, hex_sha512*/
// Global stuff //////////////////////////////////////////////////////// // Global stuff ////////////////////////////////////////////////////////
modules.threads = '2015-July-27'; modules.threads = '2015-September-15';
var ThreadManager; var ThreadManager;
var Process; var Process;
@ -2580,6 +2580,7 @@ Process.prototype.reportContextFor = function (context, otherObj) {
result.receiver = otherObj; result.receiver = otherObj;
if (result.outerContext) { if (result.outerContext) {
result.outerContext = copy(result.outerContext); result.outerContext = copy(result.outerContext);
result.outerContext.variables = copy(result.outerContext.variables);
result.outerContext.receiver = otherObj; result.outerContext.receiver = otherObj;
result.outerContext.variables.parentFrame = otherObj.variables; result.outerContext.variables.parentFrame = otherObj.variables;
} }

File diff suppressed because one or more lines are too long