From 680148ed036bcef5ecfc0ca1938b9768d8a233ca Mon Sep 17 00:00:00 2001 From: Adam Young Date: Wed, 12 Jan 2011 19:51:22 -0500 Subject: scoping functions converting function of the form ipa_ to IPA. to remove them from the global namespace. https://fedorahosted.org/freeipa/ticket/212 --- install/static/entity.js | 77 ++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 39 deletions(-) (limited to 'install/static/entity.js') diff --git a/install/static/entity.js b/install/static/entity.js index d45858fe..38ce47ed 100644 --- a/install/static/entity.js +++ b/install/static/entity.js @@ -22,7 +22,7 @@ /* REQUIRES: ipa.js, details.js, search.js, add.js */ -function ipa_facet(spec) { +IPA.facet = function (spec) { spec = spec || {}; @@ -45,7 +45,7 @@ function ipa_facet(spec) { that._entity_name = entity_name; }); - that.create_action_panel = ipa_facet_create_action_panel; + that.create_action_panel = IPA.facet_create_action_panel; function init() { } @@ -75,7 +75,7 @@ function ipa_facet(spec) { return that; } -function ipa_entity(spec) { +IPA.entity = function (spec) { spec = spec || {}; @@ -83,7 +83,7 @@ function ipa_entity(spec) { that.name = spec.name; that.label = spec.label; - that.setup = spec.setup || ipa_entity_setup; + that.setup = spec.setup || IPA.entity_setup; that.dialogs = []; that.dialogs_by_name = {}; @@ -132,7 +132,7 @@ function ipa_entity(spec) { }; that.create_association = function(spec) { - var config = ipa_association_config(spec); + var config = IPA.association_config(spec); that.add_association(config); return config; }; @@ -140,11 +140,11 @@ function ipa_entity(spec) { that.create_association_facet = function(attribute_member, other_entity, label, facet_group) { if (!attribute_member) { - attribute_member = ipa_get_member_attribute( + attribute_member = IPA.get_member_attribute( that.entity_name, other_entity); } - return ipa_association_facet({ + return IPA.association_facet({ 'name': attribute_member+'_'+other_entity, 'label': label, 'other_entity': other_entity, @@ -212,12 +212,13 @@ function ipa_entity(spec) { /* use this to track individual changes between two hashchange events */ var window_hash_cache = {}; -function ipa_get_entity(entity_name) { +/*renamed to avoid clash with IPA.get_entity*/ +IPA.fetch_entity = function (entity_name) { var entity = IPA.get_entity(entity_name); if (entity) return entity; - entity = ipa_entity({ + entity = IPA.entity({ 'name': entity_name }); @@ -225,14 +226,14 @@ function ipa_get_entity(entity_name) { return entity; } -function ipa_entity_get_search_facet(entity_name) { +IPA.entity_get_search_facet = function (entity_name) { - var entity = ipa_get_entity(entity_name); + var entity = IPA.fetch_entity(entity_name); var facet = entity.get_facet('search'); if (facet) return facet; - facet = ipa_search_facet({ + facet = IPA.search_facet({ 'name': 'search', 'label': 'Search' }); @@ -241,9 +242,9 @@ function ipa_entity_get_search_facet(entity_name) { return facet; } -function ipa_entity_set_search_definition(entity_name, data) { +IPA.entity_set_search_definition = function (entity_name, data) { - var facet = ipa_entity_get_search_facet(entity_name); + var facet = IPA.entity_get_search_facet(entity_name); for (var i=0; i', {'class': 'action'}).appendTo(action_panel); var entity = IPA.get_entity(entity_name); - var facet_name = ipa_current_facet(entity); + var facet_name = IPA.current_facet(entity); var other_facet = entity.facets[0]; var other_facet_name = other_facet.name; var nested_tabs = IPA.nested_tabs(entity_name); @@ -486,7 +485,7 @@ function ipa_facet_create_action_panel(container) { /*assume for now that entities with only a single facet do not have search*/ if (entity.facets.length > 0 ){ - if ( entity.facets[0].name === ipa_current_facet( entity)){ + if ( entity.facets[0].name === IPA.current_facet( entity)){ main_facet.text( IPA.metadata[entity_name].label); main_facet.appendTo(ul); ul.append($('
  • ')); @@ -528,7 +527,7 @@ function ipa_facet_create_action_panel(container) { If we are on the current facet, we make the text black, non-clickable, add an icon and make suer the action controls are positioned underneath it. */ - if ( other_facet.name === ipa_current_facet( entity)){ + if ( other_facet.name === IPA.current_facet( entity)){ var text = link.text(); link.text(''); link.append($('
      '). @@ -548,7 +547,7 @@ function ipa_facet_create_action_panel(container) { } else { var innerlist = $('
        ').appendTo(ul); innerlist.append(build_link(other_facet, other_facet.label)); - if ( other_facet.name === ipa_current_facet( entity)){ + if ( other_facet.name === IPA.current_facet( entity)){ innerlist.append($('
      • ')); } } -- cgit