Remove ember-views dependency from ember-states

Ember-views is now an optional dependency for ember-states. It is only required in the test file.
zulkifal · Oct 9, 2012 · c244585 · c244585
1 parent 19e2631
commit c244585
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 26 deletions.
diff --git a/packages/ember-states/lib/main.js b/packages/ember-states/lib/main.js
@@ -1,5 +1,4 @@
 require('ember-runtime');
-require('ember-views');
 
 /**
 Ember States

diff --git a/packages/ember-states/lib/state.js b/packages/ember-states/lib/state.js
@@ -213,9 +213,10 @@ Ember.State.reopenClass(
   transitionTo: function(target) {
 
     var transitionFunction = function(stateManager, contextOrEvent) {
-      var contexts, transitionArgs;
+      var contexts, transitionArgs, Event;
+      Event = Ember.$ && Ember.$.Event;
 
-      if (contextOrEvent && (contextOrEvent instanceof Ember.$.Event) && contextOrEvent.hasOwnProperty('contexts')) {
+      if (contextOrEvent && (Event && contextOrEvent instanceof Event) && contextOrEvent.hasOwnProperty('contexts')) {
         contexts = contextOrEvent.contexts.slice();
       }
       else {

diff --git a/packages/ember-states/package.json b/packages/ember-states/package.json
@@ -13,7 +13,6 @@
   "dependencies": {
     "spade":              "~> 1.0",
     "ember-runtime": "1.0.pre",
-    "ember-views": "1.0.pre"
   },
 
   "dependencies:development": {

diff --git a/packages/ember-states/tests/state_test.js b/packages/ember-states/tests/state_test.js
@@ -1,3 +1,4 @@
+require('ember-views');
 var get = Ember.get, set = Ember.set;
 
 module("Ember.State");
@@ -221,28 +222,6 @@ test("Ember.State.transitionTo passes no context arguments when there are no con
   equal( contextArgsCount, 0);
 });
 
-test("Ember.State.transitionTo passes through a single context", function(){
-  var contextArgsCount,
-      stateManager,
-      transitionFunction,
-      event;
-
-  event = new Ember.$.Event();
-  event.contexts = [];
-
-  stateManager = {
-    transitionTo: function(){
-      contextArgsCount = [].slice.call(arguments, 1).length;
-    }
-  };
-
-  transitionFunction = Ember.State.transitionTo('targetState');
-
-  transitionFunction(stateManager, event);
-
-  equal(contextArgsCount, 0);
-});
-
 test("Ember.State.transitionTo passes through a single context", function(){
   var receivedContext,
       stateManager,