From 5e90c9884977b07be8cd0d4f6377b633f29e4ad1 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Mon, 12 Nov 2012 18:05:13 +0100 Subject: Change Web UI sources to simple AMD modules Web UI sources were wrapped by AMD definition. Listed dependencies were changed accordingly. https://fedorahosted.org/freeipa/ticket/112 --- install/ui/src/freeipa/webui.js | 81 ++--------------------------------------- 1 file changed, 3 insertions(+), 78 deletions(-) (limited to 'install/ui/src/freeipa/webui.js') diff --git a/install/ui/src/freeipa/webui.js b/install/ui/src/freeipa/webui.js index f381ab0b..f6c3339e 100644 --- a/install/ui/src/freeipa/webui.js +++ b/install/ui/src/freeipa/webui.js @@ -1,6 +1,3 @@ -/*jsl:import ipa.js */ -/*jsl:import navigation.js */ - /* Authors: * Pavel Zuna * Endi S. Dewata @@ -22,7 +19,7 @@ * along with this program. If not, see . */ -/* REQUIRES: everything, this file puts it all togheter */ +define(['./ipa'], function(IPA) { /* tabs definition for IPA webUI */ @@ -128,77 +125,5 @@ IPA.self_serv_navigation = function(spec) { return that; }; -/* main (document onready event handler) */ -$(function() { - - - - /* main loop (hashchange event handler) */ - function window_hashchange(evt){ - IPA.nav.update(); - } - - function create_navigation() { - var whoami = IPA.whoami; - var factory; - - - if (whoami.hasOwnProperty('memberof_group') && - whoami.memberof_group.indexOf('admins') !== -1) { - factory = IPA.admin_navigation; - } else if (whoami.hasOwnProperty('memberofindirect_group')&& - whoami.memberofindirect_group.indexOf('admins') !== -1) { - factory = IPA.admin_navigation; - } else if (whoami.hasOwnProperty('memberof_role') && - whoami.memberof_role.length > 0) { - factory = IPA.admin_navigation; - } else if (whoami.hasOwnProperty('memberofindirect_role') && - whoami.memberofindirect_role.length > 0) { - factory = IPA.admin_navigation; - } else { - factory = IPA.self_serv_navigation; - } - - return factory({ - container: $('#navigation'), - content: $('#content') - }); - } - - - function init_on_success(data, text_status, xhr) { - $(window).bind('hashchange', window_hashchange); - - var whoami = IPA.whoami; - IPA.whoami_pkey = whoami.uid[0]; - $('#loggedinas .login').text(whoami.cn[0]); - $('#loggedinas a').fragment( - {'user-facet': 'details', 'user-pkey': IPA.whoami_pkey}, 2); - - $('#logout').click(function() { - IPA.logout(); - return false; - }).text(IPA.messages.login.logout); - - $('.header-loggedinas').css('visibility','visible'); - IPA.update_password_expiration(); - - IPA.nav = create_navigation(); - IPA.nav.create(); - IPA.nav.update(); - - $('#login_header').html(IPA.messages.login.header); - } - - - function init_on_error(xhr, text_status, error_thrown) { - var container = $('#content').empty(); - container.append('

Error: '+error_thrown.name+'

'); - container.append('

'+error_thrown.message+'

'); - } - - IPA.init({ - on_success: init_on_success, - on_error: init_on_error - }); -}); +return {}; +}); \ No newline at end of file -- cgit