From bda740491c532a907cba06750c4d50a2b3e9756f Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Fri, 23 Sep 2016 11:47:40 +0800
Subject: [PATCH] moved JIT to npm. tests pass. whoop whoop

---
 app/assets/javascripts/application.js              |  1 -
 frontend/src/Metamaps/JIT.js                       | 14 +++++++++-----
 frontend/src/Metamaps/Organize.js                  |  2 ++
 frontend/src/Metamaps/Topic.js                     |  3 +++
 frontend/src/Metamaps/Visualize.js                 |  2 ++
 .../src => frontend/src/patched}/JIT.js            | 12 ++++++------
 frontend/test/Metamaps.Import.spec.js              |  5 +----
 7 files changed, 23 insertions(+), 16 deletions(-)
 rename {app/assets/javascripts/src => frontend/src/patched}/JIT.js (99%)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 68f2179b..df086157 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -14,7 +14,6 @@
 //= require jquery-ui
 //= require jquery_ujs
 //= require_directory ./lib
-//= require ./src/JIT
 //= require ./src/Metamaps.Erb
 //= require ./webpacked/metamaps.bundle
 //= require ./src/check-canvas-support
diff --git a/frontend/src/Metamaps/JIT.js b/frontend/src/Metamaps/JIT.js
index ae9e9293..7145bf9c 100644
--- a/frontend/src/Metamaps/JIT.js
+++ b/frontend/src/Metamaps/JIT.js
@@ -1,9 +1,9 @@
 /* global Metamaps, $jit */
 
-const $jit = $jit || {}
-
 import _ from 'lodash'
 
+import $jit from '../patched/JIT'
+
 import Active from './Active'
 import Control from './Control'
 import Create from './Create'
@@ -21,6 +21,7 @@ import TopicCard from './TopicCard'
 import Util from './Util'
 import Visualize from './Visualize'
 
+
 /*
  * Metamaps.Erb
  * Metamaps.Mappings
@@ -284,7 +285,8 @@ const JIT = {
   ForceDirected: {
     animateSavedLayout: {
       modes: ['linear'],
-      transition: $jit.Trans.Quad.easeInOut,
+      // TODO fix tests so we don't need _.get
+      transition: _.get($jit, 'Trans.Quad.easeInOut'),
       duration: 800,
       onComplete: function () {
         Visualize.mGraph.busy = false
@@ -293,7 +295,8 @@ const JIT = {
     },
     animateFDLayout: {
       modes: ['linear'],
-      transition: $jit.Trans.Elastic.easeOut,
+      // TODO fix tests so we don't need _.get
+      transition: _.get($jit, 'Trans.Elastic.easeOut'),
       duration: 800,
       onComplete: function () {
         Visualize.mGraph.busy = false
@@ -554,7 +557,8 @@ const JIT = {
   ForceDirected3D: {
     animate: {
       modes: ['linear'],
-      transition: $jit.Trans.Elastic.easeOut,
+      // TODO fix tests so we don't need _.get
+      transition: _.get($jit, 'Trans.Elastic.easeOut'),
       duration: 2500,
       onComplete: function () {
         Visualize.mGraph.busy = false
diff --git a/frontend/src/Metamaps/Organize.js b/frontend/src/Metamaps/Organize.js
index c05f870e..ed005d39 100644
--- a/frontend/src/Metamaps/Organize.js
+++ b/frontend/src/Metamaps/Organize.js
@@ -2,6 +2,8 @@
 
 import _ from 'lodash'
 
+import $jit from '../patched/JIT'
+
 import Visualize from './Visualize'
 import JIT from './JIT'
 
diff --git a/frontend/src/Metamaps/Topic.js b/frontend/src/Metamaps/Topic.js
index 412f7ef2..3e8743b6 100644
--- a/frontend/src/Metamaps/Topic.js
+++ b/frontend/src/Metamaps/Topic.js
@@ -1,5 +1,7 @@
 /* global Metamaps, $ */
 
+import $jit from '../patched/JIT'
+
 import Active from './Active'
 import AutoLayout from './AutoLayout'
 import Create from './Create'
@@ -15,6 +17,7 @@ import TopicCard from './TopicCard'
 import Util from './Util'
 import Visualize from './Visualize'
 
+
 /*
  * Metamaps.Topic.js.erb
  *
diff --git a/frontend/src/Metamaps/Visualize.js b/frontend/src/Metamaps/Visualize.js
index 047cb81d..df5bab99 100644
--- a/frontend/src/Metamaps/Visualize.js
+++ b/frontend/src/Metamaps/Visualize.js
@@ -2,6 +2,8 @@
 
 import _ from 'lodash'
 
+import $jit from '../patched/JIT'
+
 import Active from './Active'
 import JIT from './JIT'
 import Router from './Router'
diff --git a/app/assets/javascripts/src/JIT.js b/frontend/src/patched/JIT.js
similarity index 99%
rename from app/assets/javascripts/src/JIT.js
rename to frontend/src/patched/JIT.js
index 4754871e..7814ecbe 100644
--- a/app/assets/javascripts/src/JIT.js
+++ b/frontend/src/patched/JIT.js
@@ -20,7 +20,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
  */
- (function () { 
 
 /*
   File: Core.js
@@ -34,7 +33,11 @@ THE SOFTWARE.
  This variable is the *only* global variable defined in the Toolkit. 
  There are also other interesting properties attached to this variable described below.
  */
-window.$jit = function(w) {
+// START METAMAPS CODE
+const $jit = function(w) {
+// ORIGINAL:
+// window.$jit = function(w) {
+// END METAMAPS CODE
   w = w || window;
   for(var k in $jit) {
     if($jit[k].$extend) {
@@ -11312,7 +11315,4 @@ $jit.ForceDirected3D.$extend = true;
 
 })($jit.ForceDirected3D);
 
-
-
-
- })();
+export default $jit
diff --git a/frontend/test/Metamaps.Import.spec.js b/frontend/test/Metamaps.Import.spec.js
index ae482c46..c8ee33b1 100644
--- a/frontend/test/Metamaps.Import.spec.js
+++ b/frontend/test/Metamaps.Import.spec.js
@@ -2,10 +2,7 @@
 
 import chai from 'chai'
 
-// JIT needs window.$jit
-require('../../app/assets/javascripts/src/JIT.js')
-
-const Import = require('../src/Metamaps/Import')
+import Import from '../src/Metamaps/Import'
 
 const { expect } = chai