Merge branch 'release/1.0.4'

troopjs · Aug 3, 2012 · e034827 · e034827
2 parents bf35e5b + 7b16a08
commit e034827
Show file tree

Hide file tree

Showing 18 changed files with 8 additions and 1,220 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.3
+1.0.4
diff --git a/src/component/gadget.js b/src/component/gadget.js
@@ -5,7 +5,7 @@
  */
 /*jshint strict:false, smarttabs:true, newcap:false, forin:false, loopfunc:true */
 /*global define:true */
-define([ "compose", "./base", "../util/deferred", "../pubsub/hub" ], function GadgetModule(Compose, Component, Deferred, hub) {
+define([ "compose", "./base", "troopjs-utils/deferred", "../pubsub/hub" ], function GadgetModule(Compose, Component, Deferred, hub) {
 	var UNDEFINED;
 	var NULL = null;
 	var FUNCTION = Function;

diff --git a/src/component/widget.js b/src/component/widget.js
@@ -5,7 +5,7 @@
  */
 /*jshint strict:false, smarttabs:true, newcap:false */
 /*global define:true */
-define([ "./gadget", "jquery", "../util/deferred" ], function WidgetModule(Gadget, $, Deferred) {
+define([ "./gadget", "jquery", "troopjs-utils/deferred" ], function WidgetModule(Gadget, $, Deferred) {
 	var UNDEFINED;
 	var NULL = null;
 	var FUNCTION = Function;

diff --git a/src/pubsub/topic.js b/src/pubsub/topic.js
@@ -5,7 +5,7 @@
  */
 /*jshint strict:false, smarttabs:true, laxbreak:true */
 /*global define:true */
-define([ "../component/base", "../util/unique" ], function TopicModule(Component, unique) {
+define([ "../component/base", "troopjs-utils/unique" ], function TopicModule(Component, unique) {
 	var TOSTRING = Object.prototype.toString;
 	var TOSTRING_ARRAY = TOSTRING.call(Array.prototype);
 

diff --git a/src/remote/ajax.js b/src/remote/ajax.js
@@ -3,7 +3,7 @@
  * @license TroopJS Copyright 2012, Mikael Karon <[email protected]>
  * Released under the MIT license.
  */
-define([ "../component/service", "../pubsub/topic", "jquery", "../util/merge" ], function AjaxModule(Service, Topic, $, merge) {
+define([ "../component/service", "../pubsub/topic", "jquery", "troopjs-utils/merge" ], function AjaxModule(Service, Topic, $, merge) {
 	return Service.extend({
 		displayName : "core/remote/ajax",
 

diff --git a/src/route/router.js b/src/route/router.js
@@ -3,7 +3,7 @@
  * @license TroopJS Copyright 2012, Mikael Karon <[email protected]>
  * Released under the MIT license.
  */
-define([ "../component/service", "../util/uri" ], function RouterModule(Service, URI) {
+define([ "../component/service", "troopjs-utils/uri" ], function RouterModule(Service, URI) {
 	var HASHCHANGE = "hashchange";
 	var $ELEMENT = "$element";
 	var ROUTE = "route";

diff --git a/src/util/callbacks.js b/src/util/callbacks.js
diff --git a/src/util/deferred.js b/src/util/deferred.js
diff --git a/src/util/each.js b/src/util/each.js
diff --git a/src/util/grep.js b/src/util/grep.js
diff --git a/src/util/merge.js b/src/util/merge.js
diff --git a/src/util/tr.js b/src/util/tr.js
diff --git a/src/util/unique.js b/src/util/unique.js