Set a better way to call dependencies on Initializer.js

Fabio Teixeira · Gabriela Navarro
1 parent 466559b5
Showing 7 changed files with 20 additions and 36 deletions Show diff stats
public/initializer.js
public/views/complete-registration.js
public/views/control-panel.js
public/views/create-institution.js
public/views/edit-software.js
public/views/new-software.js
public/views/user-edit-profile.js
@@ -8,39 +8,23 @@ var dependencies = [
 ];
-modulejs.define('Initializer', dependencies, function(cp, es, ns, uep, ci, cr) {
+modulejs.define('Initializer', dependencies, function() {
   'use strict';
+  var __dependencies = arguments;
-  return {
-    init: function() {
-      if( cp.isControlPanel() ) {
-        cp.init();
-      }
-
-
-      if( es.isEditSoftware() ) {
-        es.init();
-      }
-
-
-      if( ns.isNewSoftware() ) {
-        ns.init();
-      }
-
-      if( uep.isUserEditProfile() ) {
-        uep.init();
-      }
-
-
-      if( ci.isCreateInstitution() ) {
-        ci.init();
-      }
+  function call_dependency(dependency) {
+    if( dependency.isCurrentPage() ) {
+      dependency.init();
+    }
+  }
-      if( cr.isCompleteRegistration() ) {
-        cr.init();
+  return {
+    init: function() {
+      for(var i=0, len = __dependencies.length; i < len; i++) {
+        call_dependency(__dependencies[i]);
       }
     }
   };
@@ -44,7 +44,7 @@ modulejs.define(&#39;CompleteRegistration&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;], function($, 
   return {
-    isCompleteRegistration: function() {
+    isCurrentPage: function() {
       return $("#complete_registration").length === 1;
     },
@@ -42,7 +42,7 @@ modulejs.define(&#39;ControlPanel&#39;, [&#39;jquery&#39;], function($) {
   return {
-    isControlPanel: function() {
+    isCurrentPage: function() {
       return $("#profile-editor-index").length === 1;
     },
@@ -299,7 +299,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
   return {
-    isCreateInstitution: function() {
+    isCurrentPage: function() {
       return $("#institution_form").length === 1;
     },
@@ -65,7 +65,7 @@ modulejs.define(&#39;EditSoftware&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;AutoComplete&#39;, &#39;NewS
   return {
-    isEditSoftware: function() {
+    isCurrentPage: function() {
       return $("#especific-info").length === 1;
     },
@@ -40,13 +40,13 @@ modulejs.define(&#39;NewSoftware&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;AutoComplete&#39;], funct
   return {
-    init: function() {
-      license_info_autocomplete();
+    isCurrentPage: function() {
+      return $('#new-software-page').length === 1;
     },
-    isNewSoftware: function() {
-      return $('#new-software-page').length === 1;
+    init: function() {
+      license_info_autocomplete();
     }
   }
 });
@@ -196,7 +196,7 @@ modulejs.define(&#39;UserEditProfile&#39;, [&#39;jquery&#39;, &#39;SelectElement&#39;, &#39;SelectFieldChoic
   return {
-    isUserEditProfile: function() {
+    isCurrentPage: function() {
       return $('#profile_data_email').length === 1;
     },
	@@ -8,39 +8,23 @@ var dependencies = [		@@ -8,39 +8,23 @@ var dependencies = [
8	];	8	];
9		9
10		10
11	-modulejs.define('Initializer', dependencies, function(cp, es, ns, uep, ci, cr) {	11	+modulejs.define('Initializer', dependencies, function() {
12	'use strict';	12	'use strict';
13		13
		14	+ var __dependencies = arguments;
14		15
15	- return {
16	- init: function() {
17	- if( cp.isControlPanel() ) {
18	- cp.init();
19	- }
20	-
21	-
22	- if( es.isEditSoftware() ) {
23	- es.init();
24	- }
25	-
26	-
27	- if( ns.isNewSoftware() ) {
28	- ns.init();
29	- }
30		16
31	-
32	- if( uep.isUserEditProfile() ) {
33	- uep.init();
34	- }
35	-
36	-
37	- if( ci.isCreateInstitution() ) {
38	- ci.init();
39	- }	17	+ function call_dependency(dependency) {
		18	+ if( dependency.isCurrentPage() ) {
		19	+ dependency.init();
		20	+ }
		21	+ }
40		22
41		23
42	- if( cr.isCompleteRegistration() ) {
43	- cr.init();	24	+ return {
		25	+ init: function() {
		26	+ for(var i=0, len = __dependencies.length; i < len; i++) {
		27	+ call_dependency(__dependencies[i]);
44	}	28	}
45	}	29	}
46	};	30	};
	@@ -44,7 +44,7 @@ modulejs.define('CompleteRegistration', ['jquery', 'NoosferoRoot'], function($,		@@ -44,7 +44,7 @@ modulejs.define('CompleteRegistration', ['jquery', 'NoosferoRoot'], function($,
44		44
45		45
46	return {	46	return {
47	- isCompleteRegistration: function() {	47	+ isCurrentPage: function() {
48	return $("#complete_registration").length === 1;	48	return $("#complete_registration").length === 1;
49	},	49	},
50		50
	@@ -42,7 +42,7 @@ modulejs.define('ControlPanel', ['jquery'], function($) {		@@ -42,7 +42,7 @@ modulejs.define('ControlPanel', ['jquery'], function($) {
42		42
43		43
44	return {	44	return {
45	- isControlPanel: function() {	45	+ isCurrentPage: function() {
46	return $("#profile-editor-index").length === 1;	46	return $("#profile-editor-index").length === 1;
47	},	47	},
48		48
	@@ -299,7 +299,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']		@@ -299,7 +299,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
299		299
300		300
301	return {	301	return {
302	- isCreateInstitution: function() {	302	+ isCurrentPage: function() {
303	return $("#institution_form").length === 1;	303	return $("#institution_form").length === 1;
304	},	304	},
305		305
	@@ -65,7 +65,7 @@ modulejs.define('EditSoftware', ['jquery', 'NoosferoRoot', 'AutoComplete', 'NewS		@@ -65,7 +65,7 @@ modulejs.define('EditSoftware', ['jquery', 'NoosferoRoot', 'AutoComplete', 'NewS
65		65
66		66
67	return {	67	return {
68	- isEditSoftware: function() {	68	+ isCurrentPage: function() {
69	return $("#especific-info").length === 1;	69	return $("#especific-info").length === 1;
70	},	70	},
71		71
	@@ -196,7 +196,7 @@ modulejs.define('UserEditProfile', ['jquery', 'SelectElement', 'SelectFieldChoic		@@ -196,7 +196,7 @@ modulejs.define('UserEditProfile', ['jquery', 'SelectElement', 'SelectFieldChoic
196		196
197		197
198	return {	198	return {
199	- isUserEditProfile: function() {	199	+ isCurrentPage: function() {
200	return $('#profile_data_email').length === 1;	200	return $('#profile_data_email').length === 1;
201	},	201	},
202		202