scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2025-08-13 06:39:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Library frame vs. editor frame disambiguation

Browse source
This commit is contained in:
Tim Mickel 2016-01-21 16:49:41 -05:00
parent e492858569
commit f2bd87d60f
1 changed files with 13 additions and 13 deletions

26
src/editor/ui/Library.js
View file

@ -7,7 +7,7 @@ import Events from '../../utils/Events';
import Localization from '../../utils/Localization'; import Localization from '../../utils/Localization';
import ScratchAudio from '../../utils/ScratchAudio'; import ScratchAudio from '../../utils/ScratchAudio';
import {gn, newHTML, scaleMultiplier, import {gn, newHTML, scaleMultiplier,
getDocumentWidth, getDocumentHeight, setProps, newCanvas} from '../../utils/lib'; getDocumentWidth, getDocumentHeight, setProps, newCanvas, frame} from '../../utils/lib';
let selectedOne; let selectedOne;
let nativeJr = true; let nativeJr = true;
@ -15,13 +15,13 @@ let clickThumb;
let shaking; let shaking;
let type; let type;
let timeoutEvent; let timeoutEvent;
let frame; let libFrame;
export default class Library { export default class Library {
static init () { static init () {
frame = document.getElementById('libframe'); libFrame = document.getElementById('libframe');
frame.style.minHeight = Math.max(getDocumentHeight(), frame.offsetHeight) + 'px'; libFrame.style.minHeight = Math.max(getDocumentHeight(), frame.offsetHeight) + 'px';
var topbar = newHTML('div', 'topbar', frame); var topbar = newHTML('div', 'topbar', libFrame);
topbar.setAttribute('id', 'topbar'); topbar.setAttribute('id', 'topbar');
var actions = newHTML('div', 'actions', topbar); var actions = newHTML('div', 'actions', topbar);
actions.setAttribute('id', 'libactions'); actions.setAttribute('id', 'libactions');
@ -34,19 +34,19 @@ export default class Library {
} }
static createScrollPanel () { static createScrollPanel () {
var inner = newHTML('div', 'innerlibrary', frame); var inner = newHTML('div', 'innerlibrary', libFrame);
inner.setAttribute('id', 'asssetsview'); inner.setAttribute('id', 'asssetsview');
var div = newHTML('div', 'scrollarea', inner); var div = newHTML('div', 'scrollarea', inner);
div.setAttribute('id', 'scrollarea'); div.setAttribute('id', 'scrollarea');
} }
static open (type) { static open (libType) {
type = type; type = libType;
gn('assetname').textContent = ''; gn('assetname').textContent = '';
nativeJr = true; nativeJr = true;
frame.style.display = 'none'; frame.style.display = 'none';
frame.className = 'libframe appear'; libFrame.className = 'libframe appear';
frame.focus(); libFrame.focus();
selectedOne = undefined; selectedOne = undefined;
gn('okbut').ontouchstart = (type == 'costumes') ? Library.closeSpriteSelection : Library.closeBkgSelection; gn('okbut').ontouchstart = (type == 'costumes') ? Library.closeSpriteSelection : Library.closeBkgSelection;
Library.clean(); Library.clean();
@ -71,7 +71,7 @@ export default class Library {
static clean () { static clean () {
if (gn('scrollarea')) { if (gn('scrollarea')) {
var div = gn('scrollarea').parentNode; var div = gn('scrollarea').parentNode;
frame.removeChild(div); libFrame.removeChild(div);
} }
} }
@ -80,7 +80,7 @@ export default class Library {
e.stopPropagation(); e.stopPropagation();
ScratchAudio.sndFX('tap.wav'); ScratchAudio.sndFX('tap.wav');
ScratchJr.blur(); ScratchJr.blur();
frame.className = 'libframe disappear'; libFrame.className = 'libframe disappear';
document.body.scrollTop = 0; document.body.scrollTop = 0;
frame.style.display = 'block'; frame.style.display = 'block';
ScratchJr.editorEvents(); ScratchJr.editorEvents();
@ -130,7 +130,7 @@ export default class Library {
} }
static getpadding (div) { static getpadding (div) {
var w = Math.min(getDocumentWidth(), frame.offsetWidth); var w = Math.min(getDocumentWidth(), libFrame.offsetWidth);
var dw = div.childNodes[1].offsetLeft - div.childNodes[0].offsetLeft; var dw = div.childNodes[1].offsetLeft - div.childNodes[0].offsetLeft;
var qty = Math.floor(w / dw); var qty = Math.floor(w / dw);
var pad = Math.floor((w - (qty * dw)) / 2); var pad = Math.floor((w - (qty * dw)) / 2);