From c2f4c82ff03d5f1a8abf46038ea9186338e3ca4e Mon Sep 17 00:00:00 2001
From: Tim Mickel <tim.mickel@gmail.com>
Date: Thu, 21 Jan 2016 15:47:25 -0500
Subject: [PATCH] Fixing imports

---
 src/editor/engine/Page.js    | 12 ++++++------
 src/editor/engine/Runtime.js |  2 +-
 src/editor/engine/Sprite.js  |  6 +++---
 src/editor/engine/Stage.js   |  6 +++---
 src/editor/ui/Library.js     |  2 +-
 src/editor/ui/Project.js     |  2 +-
 src/editor/ui/ScriptsPane.js |  4 ++--
 src/editor/ui/Thumbs.js      |  2 +-
 src/editor/ui/UI.js          |  2 +-
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/editor/engine/Page.js b/src/editor/engine/Page.js
index d46ddc6..27c7275 100644
--- a/src/editor/engine/Page.js
+++ b/src/editor/engine/Page.js
@@ -1,15 +1,15 @@
 import ScratchJr from '../ScratchJr';
-import Project from '../../ui/Project';
-import Thumbs from '../../ui/Thumbs';
-import UI from '../../ui/UI';
+import Project from '../ui/Project';
+import Thumbs from '../ui/Thumbs';
+import UI from '../ui/UI';
 import Sprite from './Sprite';
-import Palette from './Palette';
+import Palette from '../ui/Palette';
 import BlockSpecs from '../blocks/BlockSpecs';
 import iOS from '../../iPad/iOS';
 import IO from '../../iPad/IO';
 import Undo from '../ui/Undo';
-import Matrix from '../geom/Matrix';
-import Vector from '../geom/Vector';
+import Matrix from '../../geom/Matrix';
+import Vector from '../../geom/Vector';
 import {newHTML, newDiv, gn,
     setCanvasSizeScaledToWindowDocumentHeight,
     DEGTOR, getIdFor, setProps, isTablet} from '../../utils/lib';
diff --git a/src/editor/engine/Runtime.js b/src/editor/engine/Runtime.js
index 5985e8c..9ddae34 100755
--- a/src/editor/engine/Runtime.js
+++ b/src/editor/engine/Runtime.js
@@ -1,5 +1,5 @@
 import ScratchJr from '../ScratchJr';
-import Project from '../../ui/Project';
+import Project from '../ui/Project';
 import Prims from './Prims';
 import Thread from './Thread';
 
diff --git a/src/editor/engine/Sprite.js b/src/editor/engine/Sprite.js
index 06d8f65..59e4a47 100755
--- a/src/editor/engine/Sprite.js
+++ b/src/editor/engine/Sprite.js
@@ -8,9 +8,9 @@
 ////////////////////////////////////////////////////////////
 
 import ScratchJr from '../ScratchJr';
-import Project from '../../ui/Project';
-import Thumbs from '../../ui/Thumbs';
-import UI from '../../ui/UI';
+import Project from '../ui/Project';
+import Thumbs from '../ui/Thumbs';
+import UI from '../ui/UI';
 import BlockSpecs from '../blocks/BlockSpecs';
 import iOS from '../../iPad/iOS';
 import IO from '../../iPad/IO';
diff --git a/src/editor/engine/Stage.js b/src/editor/engine/Stage.js
index f2b6ee0..ba5682f 100644
--- a/src/editor/engine/Stage.js
+++ b/src/editor/engine/Stage.js
@@ -1,7 +1,7 @@
 import ScratchJr from '../ScratchJr';
-import Project from '../../ui/Project';
-import Thumbs from '../../ui/Thumbs';
-import UI from '../../ui/UI';
+import Project from '../ui/Project';
+import Thumbs from '../ui/Thumbs';
+import UI from '../ui/UI';
 import Undo from '../ui/Undo';
 import ScriptsPane from '../ui/ScriptsPane';
 import Rectangle from '../../geom/Rectangle';
diff --git a/src/editor/ui/Library.js b/src/editor/ui/Library.js
index 6017974..649bfe8 100644
--- a/src/editor/ui/Library.js
+++ b/src/editor/ui/Library.js
@@ -6,7 +6,7 @@ import Paint from '../../painteditor/Paint';
 import Events from '../../utils/Events';
 import Localization from '../../utils/Localization';
 import ScratchAudio from '../../utils/ScratchAudio';
-import {frame, gn, newHTML, scaleMultiplier,
+import {gn, newHTML, scaleMultiplier,
     getDocumentWidth, getDocumentHeight, setProps, newCanvas} from '../../utils/lib';
 
 let selectedOne;
diff --git a/src/editor/ui/Project.js b/src/editor/ui/Project.js
index 0ff9d5a..e3ab82d 100644
--- a/src/editor/ui/Project.js
+++ b/src/editor/ui/Project.js
@@ -3,7 +3,7 @@ import BlockSpecs from '../blocks/BlockSpecs';
 import Alert from './Alert';
 import Palette from './Palette';
 import UI from './UI';
-import Page from './Page';
+import Page from '../engine/Page';
 import Sprite from '../engine/Sprite';
 import iOS from '../../iPad/iOS';
 import IO from '../../iPad/IO';
diff --git a/src/editor/ui/ScriptsPane.js b/src/editor/ui/ScriptsPane.js
index 8b00f1f..3b0bfe5 100644
--- a/src/editor/ui/ScriptsPane.js
+++ b/src/editor/ui/ScriptsPane.js
@@ -6,9 +6,9 @@ import Palette from './Palette';
 import Undo from './Undo';
 import Events from '../../utils/Events';
 import Scroll from './Scroll';
-import Menu from './Menu';
+import Menu from '../blocks/Menu';
 import ScratchAudio from '../../utils/ScratchAudio';
-import {frame, gn, localx, localy, newHTML, isTablet,
+import {gn, localx, localy, newHTML, isTablet,
     globalx, globaly, setCanvasSize, getDocumentHeight, frame} from '../../utils/lib';
 
 let scroll = undefined;
diff --git a/src/editor/ui/Thumbs.js b/src/editor/ui/Thumbs.js
index bdaf9ad..f89bb75 100644
--- a/src/editor/ui/Thumbs.js
+++ b/src/editor/ui/Thumbs.js
@@ -4,7 +4,7 @@
 
 import ScratchJr from '../ScratchJr';
 import Palette from './Palette';
-import Page from './Page';
+import Page from '../engine/Page';
 import ScriptsPane from './ScriptsPane';
 import Undo from './Undo';
 import UI from './UI';
diff --git a/src/editor/ui/UI.js b/src/editor/ui/UI.js
index 0bd0de2..3e3aa2d 100644
--- a/src/editor/ui/UI.js
+++ b/src/editor/ui/UI.js
@@ -9,7 +9,7 @@ import Project from './Project';
 import Thumbs from './Thumbs';
 import Palette from './Palette';
 import Grid from './Grid';
-import Stage from './Stage';
+import Stage from '../engine/Stage';
 import ScriptsPane from './ScriptsPane';
 import Undo from './Undo';
 import Library from './Library';