CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-07 09:00:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'googleblockly/master'

Browse Source 
Conflicts:
	blockly_uncompressed.js
This commit is contained in:
daarond
2015-05-15 16:58:22 -05:00
parent 62f9659d05 3cf4b51c31
commit 6809e9b49e
11 changed files with 92 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
demos/code/code.js
View File

@@ -343,18 +343,6 @@ Code.renderContent = function() {
Code.init = function() {
Code.initLanguage();
// Disable the link button if page isn't backed by App Engine storage.
var linkButton = document.getElementById('linkButton');
if ('BlocklyStorage' in window) {
BlocklyStorage['HTTPREQUEST_ERROR'] = MSG['httpRequestError'];
BlocklyStorage['LINK_ALERT'] = MSG['linkAlert'];
BlocklyStorage['HASH_ERROR'] = MSG['hashError'];
BlocklyStorage['XML_ERROR'] = MSG['xmlError'];
Code.bindClick(linkButton, BlocklyStorage.link);
} else if (linkButton) {
linkButton.className = 'disabled';
}
var rtl = Code.isRtl();
var container = document.getElementById('content_area');
var onresize = function(e) {
@@ -398,7 +386,7 @@ Code.init = function() {
if ('BlocklyStorage' in window) {
// Hook a save function onto unload.
BlocklyStorage.backupOnUnload();
BlocklyStorage.backupOnUnload(Code.workspace);
}
Code.tabClick(Code.selected);
@@ -407,6 +395,18 @@ Code.init = function() {
Code.bindClick('trashButton',
function() {Code.discard(); Code.renderContent();});
Code.bindClick('runButton', Code.runJS);
// Disable the link button if page isn't backed by App Engine storage.
var linkButton = document.getElementById('linkButton');
if ('BlocklyStorage' in window) {
BlocklyStorage['HTTPREQUEST_ERROR'] = MSG['httpRequestError'];
BlocklyStorage['LINK_ALERT'] = MSG['linkAlert'];
BlocklyStorage['HASH_ERROR'] = MSG['hashError'];
BlocklyStorage['XML_ERROR'] = MSG['xmlError'];
Code.bindClick(linkButton,
function() {BlocklyStorage.link(Code.workspace);});
} else if (linkButton) {
linkButton.className = 'disabled';
}
for (var i = 0; i < Code.TABS_.length; i++) {
var name = Code.TABS_[i];