[prev in list] [next in list] [prev in thread] [next in thread]
List: forgerock-commons
Subject: [Commons] [2578] forgerock-ui/trunk: CR-5010 - CUI-35 - Problems with loading in IE 9
From: noreply () forgerock ! org
Date: 2014-10-28 22:35:46
Message-ID: 20141028223547.0ECEB3F86D () sources ! internal ! forgerock ! com
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2578] forgerock-ui/trunk: CR-5010 - CUI-35 - Problems with loading in IE \
9</title> </head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://sources.forgerock.org/changelog/commons/?cs=2578">2578</a></dd> \
<dt>Author</dt> <dd>jake.feasel</dd> <dt>Date</dt> <dd>2014-10-28 22:35:46 +0000 \
(Tue, 28 Oct 2014)</dd> </dl>
<h3>Log Message</h3>
<pre>CR-5010 - CUI-35 - Problems with loading in IE 9</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsconfigvalidatorsCommonValidat \
orsjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/config/validators/CommonValidators.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonE \
nableCookiesViewjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/EnableCookiesView.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonL \
oggedUserBarViewjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoggedUserBarView.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonL \
oginDialogjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginDialog.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonL \
oginViewjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginView.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonN \
otFoundViewjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/NotFoundView.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonS \
iteConfiguratorjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/SiteConfigurator.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonc \
omponentsBreadcrumbsjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Breadcrumbs.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonc \
omponentsConfirmationDialogjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ConfirmationDialog.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonc \
omponentsDialogjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Dialog.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonc \
omponentsElementTablejs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ElementTable.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonc \
omponentsFooterjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Footer.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonc \
omponentsGridTableViewjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/GridTableView.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonc \
omponentsLineTableViewjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/LineTableView.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonc \
omponentsMessagesjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Messages.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonc \
omponentsNavigationjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Navigation.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonc \
omponentspopupPopupViewjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/popup/PopupView.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonm \
ainAbstractDelegatejs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractDelegate.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonm \
ainAbstractViewjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractView.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonm \
ainErrorsHandlerjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ErrorsHandler.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonm \
ainEventManagerjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/EventManager.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonm \
ainGenericRouteInterfaceMapjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/GenericRouteInterfaceMap.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonm \
ainServiceInvokerjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ServiceInvoker.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonm \
ainSessionManagerjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SessionManager.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonm \
ainSpinnerManagerjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SpinnerManager.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonm \
ainValidatorsManagerjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ValidatorsManager.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonm \
ainViewManagerjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ViewManager.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonm \
aini18nManagerjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/i18nManager.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonu \
tilFormGenerationUtilsjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/FormGenerationUtils.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonu \
tilUIUtilsjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/UIUtils.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonu \
tilValidatorsUtilsjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/ValidatorsUtils.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonu \
tilmainjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/main.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainresourcestemplatescommonDefaul \
tBaseTemplatehtml">forgerock-ui/trunk/forgerock-ui-commons/src/main/resources/templates/common/DefaultBaseTemplate.html</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainresourcestemplatescommonLoginB \
aseTemplatehtml">forgerock-ui/trunk/forgerock-ui-commons/src/main/resources/templates/common/LoginBaseTemplate.html</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainresourcestemplatescommonMedium \
BaseTemplatehtml">forgerock-ui/trunk/forgerock-ui-commons/src/main/resources/templates/common/MediumBaseTemplate.html</a></li>
<li><a href="#forgerockuitrunkforgerockuimocksrcmainjsmainjs">forgerock-ui/trunk/forgerock-ui-mock/src/main/js/main.js</a></li>
<li><a href="#forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuicommondelegat \
esPolicyDelegatejs">forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/common/delegates/PolicyDelegate.js</a></li>
<li><a href="#forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuicommonutilThe \
meManagerjs">forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/common/util/ThemeManager.js</a></li>
<li><a href="#forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuiuserLoginView \
js">forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/LoginView.js</a></li>
<li><a href="#forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuiuserTermsOfUs \
eDialogjs">forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/TermsOfUseDialog.js</a></li>
<li><a href="#forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuiuserUserRegis \
trationViewjs">forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/UserRegistrationView.js</a></li>
<li><a href="#forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuiuserdelegates \
UserDelegatejs">forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/delegates/UserDelegate.js</a></li>
<li><a href="#forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuiuserprofileCh \
angeSecurityDataDialogjs">forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/profile/ChangeSecurityDataDialog.js</a></li>
<li><a href="#forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuiuserprofileEn \
terOldPasswordDialogjs">forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/profile/EnterOldPasswordDialog.js</a></li>
<li><a href="#forgerockuitrunkforgerockuimocksrcmainresourcesindexhtml">forgerock-ui/trunk/forgerock-ui-mock/src/main/resources/index.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonma \
inUniversalCachedDelegatejs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/UniversalCachedDelegate.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonm \
ainUniversalDelegatejs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/UniversalDelegate.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsconfigvalidatorsCommonValidatorsjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/config/validators/CommonValidators.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/config/validators/CommonValidators.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/config/validators/CommonValidators.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,13 +22,14 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, _ */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> */
</span><span class="cx"> define("config/validators/CommonValidators", [
</span><del>-], function(constants, eventManager) {
</del><ins>+ "jquery"
+], function($) {
</ins><span class="cx"> var obj = {
</span><span class="cx"> "required": {
</span><span class="cx"> "name": "Required field",
</span><span class="lines">@@ -41,7 +42,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- callback();
</del><ins>+ callback();
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> "passwordConfirm": {
</span><span class="lines">@@ -57,7 +58,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- callback();
</del><ins>+ callback();
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> "minLength": {
</span><span class="lines">@@ -75,12 +76,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (errors.length === 0) {
</span><del>- callback();
</del><ins>+ callback();
</ins><span class="cx"> } else {
</span><span class="cx"> callback(errors);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> };
</span><span class="cx"> return obj;
</span><span class="cx"> });
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonEnableCookiesViewjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/EnableCookiesView.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/EnableCookiesView.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/EnableCookiesView.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $ */
</del><ins>+/*global define, location, */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author Huck Elliott
</span><span class="lines">@@ -35,14 +35,13 @@
</span><span class="cx"> template: \
"templates/common/EnableCookiesTemplate.html", </span><span class="cx"> \
baseTemplate: "templates/common/LoginBaseTemplate.html", </span><span \
class="cx"> render: function() { </span><del>- \
if(!cookieHelper.cookiesEnabled()){ </del><ins>+ if \
(!cookieHelper.cookiesEnabled()) { </ins><span class="cx"> \
this.parentRender(); </span><del>- }
- else{
</del><ins>+ } else {
</ins><span class="cx"> location.href = "#login/";
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- });
</del><ins>+ });
</ins><span class="cx">
</span><span class="cx"> return new EnableCookiesView();
</span><span class="cx"> });
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonLoggedUserBarViewjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoggedUserBarView.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoggedUserBarView.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoggedUserBarView.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,16 +22,17 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, Backbone */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> */
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/LoggedUserBarView", [ </span><ins>+ \
"backbone", </ins><span class="cx"> \
"org/forgerock/commons/ui/common/main/EventManager", </span><span \
class="cx"> "org/forgerock/commons/ui/common/util/Constants", \
</span><span class="cx"> \
"org/forgerock/commons/ui/common/main/Configuration" </span><del>-], \
function(eventManager, constants, conf) { </del><ins>+], function(Backbone, \
eventManager, constants, conf) { </ins><span class="cx"> var LoggedUserBarView = \
Backbone.View.extend({ </span><span class="cx"> element: \
"#loginContent", </span><span class="cx"> events : {
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonLoginDialogjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginDialog.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginDialog.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginDialog.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,9 +22,11 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global $, _, define*/
</del><ins>+/*global define*/
</ins><span class="cx">
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/LoginDialog", [ </span><ins>+ \
"jquery", + "underscore",
</ins><span class="cx"> \
"org/forgerock/commons/ui/common/main/ValidatorsManager", </span><span \
class="cx"> "org/forgerock/commons/ui/common/main/Configuration", \
</span><span class="cx"> \
"org/forgerock/commons/ui/common/main/EventManager", </span><span \
class="lines">@@ -32,7 +34,7 @@ </span><span class="cx"> \
"org/forgerock/commons/ui/common/components/Dialog", </span><span \
class="cx"> "org/forgerock/commons/ui/common/main/SessionManager", \
</span><span class="cx"> \
"org/forgerock/commons/ui/common/main/ViewManager" </span><del>-], \
function(validatorsManager, conf, eventManager, constants, Dialog, sessionManager, \
viewManager) { </del><ins>+], function($, _, validatorsManager, conf, eventManager, \
constants, Dialog, sessionManager, viewManager) { </ins><span class="cx"> var \
LoginDialog = Dialog.extend({ </span><span class="cx"> contentTemplate: \
"templates/common/LoginDialog.html", </span><span class="cx"> \
element: '#dialogs', </span><span class="lines">@@ -62,7 +64,7 @@
</span><span class="cx"> \
validatorsManager.bindValidators(this.$el); </span><span class="cx"> \
</span><span class="cx"> \
$(".dialog-background").off('click').on('click', _.bind(this.loginClose, \
this)); </span><del>-
</del><ins>+
</ins><span class="cx"> if (conf.loggedUser && \
conf.loggedUser.userName) </span><span class="cx"> {
</span><span class="cx"> \
$("input[name=login]").val(conf.loggedUser.userName).trigger("keyup");
</span><span class="lines">@@ -71,7 +73,7 @@
</span><span class="cx"> else
</span><span class="cx"> {
</span><span class="cx"> \
$("input[name=login]").focus(); </span><del>- }
</del><ins>+ }
</ins><span class="cx"> }, this));
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="lines">@@ -105,12 +107,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }, function() {
</span><del>- \
eventManager.sendEvent(constants.EVENT_DISPLAY_MESSAGE_REQUEST, \
"authenticationFailed"); </del><ins>+ \
eventManager.sendEvent(constants.EVENT_DISPLAY_MESSAGE_REQUEST, \
"authenticationFailed"); </ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> data : {
</span><del>- height: 200,
</del><ins>+ height: 200,
</ins><span class="cx"> width: 400
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonLoginViewjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginView.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginView.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/LoginView.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, form2js, _, js2form, window */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonNotFoundViewjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/NotFoundView.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/NotFoundView.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/NotFoundView.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $ */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonSiteConfiguratorjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/SiteConfigurator.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/SiteConfigurator.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/SiteConfigurator.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,122 +22,102 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global $, define, require */
</del><ins>+/*global define, require */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> */
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/SiteConfigurator", [ </span><del>- \
"org/forgerock/commons/ui/common/main/AbstractConfigurationAware",
- "org/forgerock/commons/ui/common/util/Constants",
- "org/forgerock/commons/ui/common/main/EventManager",
- "org/forgerock/commons/ui/common/main/Configuration",
- "org/forgerock/commons/ui/common/main/i18nManager"
-], function(AbstractConfigurationAware, constants, eventManager, conf, i18nManager) \
{
- var obj = new AbstractConfigurationAware();
-
- obj.initialized = false;
-
- $(document).on(constants.EVENT_READ_CONFIGURATION_REQUEST, function() {
- var configurationDelegate;
</del><ins>+ "jquery",
+ "underscore",
+ "org/forgerock/commons/ui/common/main/AbstractConfigurationAware",
+ "org/forgerock/commons/ui/common/util/Constants",
+ "org/forgerock/commons/ui/common/main/EventManager",
+ "org/forgerock/commons/ui/common/main/Configuration",
+ "org/forgerock/commons/ui/common/main/i18nManager"
+], function($, _, AbstractConfigurationAware, constants, eventManager, conf, \
i18nManager) { + var obj = new AbstractConfigurationAware();
+
+ obj.initialized = false;
+
+ $(document).on(constants.EVENT_READ_CONFIGURATION_REQUEST, function() {
+ var configurationDelegate;
</ins><span class="cx">
</span><del>- if (!conf.globalData) {
- conf.setProperty('globalData', {});
- conf.globalData.auth = {};
- }
</del><ins>+ if (!conf.globalData) {
+ conf.setProperty('globalData', {});
+ conf.globalData.auth = {};
+ }
</ins><span class="cx">
</span><del>- if (!conf.delegateCache) {
- conf.setProperty('delegateCache', {});
- }
</del><ins>+ if (!conf.delegateCache) {
+ conf.setProperty('delegateCache', {});
+ }
</ins><span class="cx">
</span><del>- console.info("READING CONFIGURATION");
</del><ins>+ console.info("READING CONFIGURATION");
</ins><span class="cx">
</span><del>- if (obj.configuration && obj.initialized === false) {
- obj.initialized = true;
-
- if (obj.configuration.remoteConfig === true) {
- configurationDelegate = require(obj.configuration.delegate);
- configurationDelegate.getConfiguration(function(config) {
- obj.processConfiguration(config);
- eventManager.sendEvent(constants.EVENT_APP_INTIALIZED);
- }, function() {
- obj.processConfiguration({});
- eventManager.sendEvent(constants.EVENT_APP_INTIALIZED); \
- });
- } else {
- obj.processConfiguration(obj.configuration);
- eventManager.sendEvent(constants.EVENT_APP_INTIALIZED);
- }
- }
- });
</del><ins>+ if (obj.configuration && obj.initialized === false) {
+ obj.initialized = true;
+
+ if (obj.configuration.remoteConfig === true) {
+ configurationDelegate = require(obj.configuration.delegate);
+ configurationDelegate.getConfiguration(function(config) {
+ obj.processConfiguration(config);
+ eventManager.sendEvent(constants.EVENT_APP_INTIALIZED);
+ }, function() {
+ obj.processConfiguration({});
+ eventManager.sendEvent(constants.EVENT_APP_INTIALIZED);
+ });
+ } else {
+ obj.processConfiguration(obj.configuration);
+ eventManager.sendEvent(constants.EVENT_APP_INTIALIZED);
+ }
+ }
+ });
</ins><span class="cx">
</span><del>- obj.processConfiguration = function(config) {
</del><ins>+ obj.processConfiguration = function(config) {
+ // whatever settings were found will be saved in globalData
+ _.extend(conf.globalData, config);
</ins><span class="cx">
</span><del>- if (config.securityQuestions === true) {
- conf.globalData.securityQuestions = true;
- }
-
- if (config.siteImages) {
- conf.globalData.siteImages = config.siteImages;
- }
-
- if (config.passwordResetLink) {
- conf.globalData.passwordResetLink = config.passwordResetLink;
- }
</del><ins>+ if (config.defaultNotificationType) {
+ conf.defaultType = config.defaultNotificationType;
+ }
</ins><span class="cx">
</span><del>- if (config.roles) {
- conf.globalData.userRoles = config.roles;
- }
-
- if (config.notificationTypes) {
- conf.notificationTypes = config.notificationTypes;
- }
-
- if (config.defaultNotificationType) {
- conf.defaultType = config.defaultNotificationType;
- }
</del><ins>+ if (config.notificationTypes) {
+ conf.notificationTypes = config.notificationTypes;
+ }
</ins><span class="cx">
</span><del>- if (config.policyEditorConfig) {
- conf.globalData.policyEditorConfig = config.policyEditorConfig;
- }
</del><ins>+ if (config.roles) {
+ conf.globalData.userRoles = config.roles;
+ }
</ins><span class="cx">
</span><ins>+ conf.globalData.auth.cookieName = config.cookieName;
+ conf.globalData.auth.cookieDomains = config.domains;
</ins><span class="cx">
</span><del>- conf.globalData.selfRegistration = \
config.selfRegistration;
- conf.globalData.siteIdentification = \
config.siteIdentification;
- conf.globalData.protectedUserAttributes = \
config.protectedUserAttributes;
- conf.globalData.requirePasswordForEmailChange = \
config.requirePasswordForEmailChange;
- conf.globalData.forgotPassword = \
config.forgotPassword;
- conf.globalData.successfulUserRegistrationDestination = \
config.successfulUserRegistrationDestination;
- conf.globalData.auth.cookieName = config.cookieName;
- conf.globalData.auth.cookieDomains = config.domains;
- conf.globalData.socialImplementations = \
config.socialImplementations; </del><ins>+ i18nManager.init(config.lang);
</ins><span class="cx">
</span><del>- i18nManager.init(config.lang);
</del><ins>+ };
</ins><span class="cx">
</span><del>- };
</del><ins>+ obj.configurePage = function (route, params) {
+ var promise = $.Deferred(),
+ configurationDelegate;
</ins><span class="cx">
</span><del>- obj.configurePage = function (route, params) {
- var promise = $.Deferred(),
- configurationDelegate;
</del><ins>+ if (obj.configuration.remoteConfig === true) {
+ configurationDelegate = require(obj.configuration.delegate);
+ if (typeof configurationDelegate.checkForDifferences === \
"function") { + \
configurationDelegate.checkForDifferences(route, params).then(function (config) { + \
if (config) { + obj.processConfiguration(config);
+ }
+ promise.resolve();
+ });
+ } else {
+ promise.resolve();
+ }
+ } else {
+ promise.resolve();
+ }
</ins><span class="cx">
</span><del>- if (obj.configuration.remoteConfig === true) {
- configurationDelegate = require(obj.configuration.delegate);
- if (typeof configurationDelegate.checkForDifferences === \
"function") {
- configurationDelegate.checkForDifferences(route, \
params).then(function (config) {
- if (config) {
- obj.processConfiguration(config);
- }
- promise.resolve();
- });
- } else {
- promise.resolve();
- }
- } else {
- promise.resolve();
- }
-
- return promise;
- };
-
- return obj;
</del><ins>+ return promise;
+ };
+
+ return obj;
</ins><span class="cx"> });
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommoncomponentsBreadcrumbsjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Breadcrumbs.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Breadcrumbs.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Breadcrumbs.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,16 +22,17 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, _, Backbone, window, document */
</del><ins>+/*global define, window, document */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/components/Breadcrumbs", [ \
</span><ins>+ "jquery", </ins><span class="cx"> \
"underscore", </span><span class="cx"> "backbone"
</span><del>-], function(_, Backbone) {
</del><ins>+], function($, _, Backbone) {
</ins><span class="cx"> var Breadcrumbs= Backbone.View.extend({
</span><span class="cx">
</span><span class="cx"> size: 0,
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommoncomponentsConfirmationDialogjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ConfirmationDialog.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ConfirmationDialog.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ConfirmationDialog.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,17 +22,18 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, _, Backbone, window */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/components/ConfirmationDialog", [ \
</span><del>- \
"org/forgerock/commons/ui/common/components/Dialog"
-], function(Dialog) {
</del><ins>+ "org/forgerock/commons/ui/common/components/Dialog",
+ "underscore"
+], function(Dialog, _) {
</ins><span class="cx"> var ConfirmationDialog = Dialog.extend({
</span><del>- template: "templates/common/DialogTemplate.html", \
</del><ins>+ template: "templates/common/DialogTemplate.html",
</ins><span class="cx"> contentTemplate: \
"templates/common/ConfirmationDialogTemplate.html", </span><span \
class="cx"> </span><span class="cx"> events: {
</span><span class="lines">@@ -43,9 +44,7 @@
</span><span class="cx"> "click .dialogContainer": \
"stop" </span><span class="cx"> },
</span><span class="cx">
</span><del>- data: {
-
- },
</del><ins>+ data: { },
</ins><span class="cx">
</span><span class="cx"> formSubmit: function() {
</span><span class="cx"> this.okCallback();
</span><span class="lines">@@ -62,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> this.show(_.bind(function() {
</span><span class="cx"> \
this.$el.find("input[type=submit]").prop('disabled', false); </span><del>- \
}, this)); </del><ins>+ }, this));
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommoncomponentsDialogjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Dialog.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Dialog.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Dialog.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,19 +22,21 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, _, Backbone, window */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/components/Dialog", [ </span><ins>+ \
"jquery", + "underscore",
</ins><span class="cx"> \
"org/forgerock/commons/ui/common/main/AbstractView", </span><span \
class="cx"> "org/forgerock/commons/ui/common/util/UIUtils", \
</span><span class="cx"> \
"org/forgerock/commons/ui/common/util/Constants", </span><span class="cx"> \
"org/forgerock/commons/ui/common/main/EventManager", </span><span \
class="cx"> "org/forgerock/commons/ui/common/main/Configuration" \
</span><del>-], function(AbstractView, uiUtils, constants, eventManager, conf) { \
</del><ins>+], function($, _, AbstractView, uiUtils, constants, eventManager, conf) { \
</ins><span class="cx"> var Dialog = AbstractView.extend({ </span><span \
class="cx"> template: "templates/common/DialogTemplate.html", \
</span><span class="cx"> element: "#dialogs", </span><span \
class="lines">@@ -65,7 +67,7 @@ </span><span class="cx"> * Then creates \
actions buttons and bind events. If actions map is empty, default </span><span \
class="cx"> * close action is added. </span><span class="cx"> */
</span><del>- show: function(callback) {
</del><ins>+ show: function(callback) {
</ins><span class="cx">
</span><span class="cx"> this.setElement($("#dialogs"));
</span><span class="cx"> this.parentRender(_.bind(function() {
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommoncomponentsElementTablejs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ElementTable.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ElementTable.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/ElementTable.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global $, define*/
</del><ins>+/*global define*/
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author jdabrowski
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommoncomponentsFooterjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Footer.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Footer.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Footer.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, _, Backbone, window */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/components/Footer", [ </span><span \
class="cx"> "org/forgerock/commons/ui/common/main/AbstractView" \
</span></span></pre></div> <a \
id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommoncomponentsGridTableViewjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/GridTableView.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/GridTableView.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/GridTableView.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,14 +22,16 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, _, Backbone, window */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author jdabrowski
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/components/GridTableView", [ \
</span><del>-], function() { </del><ins>+ "jquery",
+ "backbone"
+], function($, Backbone) {
</ins><span class="cx">
</span><span class="cx"> var GridTableView = Backbone.View.extend({
</span><span class="cx">
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommoncomponentsLineTableViewjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/LineTableView.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/LineTableView.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/LineTableView.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,14 +22,16 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, _, Backbone, window */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author jdabrowski
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/components/LineTableView", [ \
</span><del>-], function() { </del><ins>+ "jquery",
+ "backbone"
+], function($, Backbone) {
</ins><span class="cx">
</span><span class="cx"> var LineTableView = Backbone.View.extend({
</span><span class="cx">
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommoncomponentsMessagesjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Messages.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Messages.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Messages.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,17 +22,18 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, _, Backbone, window */
</del><ins>+/*global define, window */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author jkigwana
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/components/Messages", [ \
</span><ins>+ "jquery", </ins><span class="cx"> \
"underscore", </span><span class="cx"> "backbone",
</span><span class="cx"> \
"org/forgerock/commons/ui/common/main/AbstractConfigurationAware" \
</span><del>-], function(_, backbone, AbstractConfigurationAware) { </del><ins>+], \
function($, _, Backbone, AbstractConfigurationAware) { </ins><span class="cx"> \
var obj = new AbstractConfigurationAware(), Messages; </span><span class="cx">
</span><span class="cx"> Messages = Backbone.View.extend({
</span><span class="lines">@@ -73,20 +74,20 @@
</span><span class="cx"> }
</span><span class="cx"> console.info(msg.type + ":", \
msg.message, msg); </span><span class="cx"> _this.list.push(msg);
</span><del>- if (_this.list.length <= 1) {
- _this.showMessage(msg);
- }
</del><ins>+ if (_this.list.length <= 1) {
+ _this.showMessage(msg);
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> nextMessage: function() {
</span><span class="cx"> var _this = obj.messages;
</span><span class="cx"> _this.list.shift();
</span><del>- if (_this.list.length > 0) {
- _this.showMessage();
</del><ins>+ if (_this.list.length > 0) {
+ _this.showMessage();
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- removeAndNext: function() {
</del><ins>+ removeAndNext: function() {
</ins><span class="cx"> var _this = obj.messages;
</span><span class="cx"> window.clearTimeout(obj.messages.timer);
</span><span class="cx"> _this.$el.find("div").fadeOut(300, \
function(){ </span><span class="lines">@@ -105,11 +106,11 @@
</span><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><del>- hideMessages: function() {
</del><ins>+ hideMessages: function() {
</ins><span class="cx"> var _this = obj.messages;
</span><del>- if (_this.list.length > 1) {
- _this.list = [_this.list[1]];
- }
</del><ins>+ if (_this.list.length > 1) {
+ _this.list = [_this.list[1]];
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> });
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommoncomponentsNavigationjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Navigation.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Navigation.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Navigation.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,13 +22,14 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, _, Backbone, window */
</del><ins>+/*global define, window */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/components/Navigation", [ \
</span><ins>+ "jquery", </ins><span class="cx"> \
"underscore", </span><span class="cx"> "backbone",
</span><span class="cx"> \
"org/forgerock/commons/ui/common/main/AbstractConfigurationAware", \
</span><span class="lines">@@ -38,7 +39,7 @@ </span><span class="cx"> \
"org/forgerock/commons/ui/common/main/EventManager", </span><span \
class="cx"> "org/forgerock/commons/ui/common/main/ViewManager", \
</span><span class="cx"> "org/forgerock/commons/ui/common/main/Router" \
</span><del>-], function(_, Backbone, AbstractConfigurationAware, AbstractView, conf, \
constants, eventManager, viewManager, router) { </del><ins>+], function($, _, \
Backbone, AbstractConfigurationAware, AbstractView, conf, constants, eventManager, \
viewManager, router) { </ins><span class="cx"> var obj = new \
AbstractConfigurationAware(); </span><span class="cx">
</span><span class="cx"> obj.init = function() {
</span><span class="lines">@@ -74,11 +75,11 @@
</span><span class="cx"> subUrl = \
url.urls[subUrlName]; </span><span class="cx"> \
this.addSubLink(subUrl.name, subUrl.url, this.isCurrent(subUrl.url), subUrl.icon, \
subUrl.inactive); </span><span class="cx"> }
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> this.addLink(url.name, url.url, \
false,url.icon, url.inactive); </span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> },
</span><span class="lines">@@ -91,7 +92,7 @@
</span><span class="cx"> isActive: isActive,
</span><span class="cx"> isInactive: isInactive,
</span><span class="cx"> icon: icon
</span><del>- });
</del><ins>+ });
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> addSubLink: function(name, url, isActive, icon, \
isInactive) { </span><span class="lines">@@ -102,7 +103,7 @@
</span><span class="cx"> isActive: isActive,
</span><span class="cx"> isInactive: isInactive,
</span><span class="cx"> icon: icon
</span><del>- });
</del><ins>+ });
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> childIsCurrent: function(urls) {
</span><span class="lines">@@ -148,7 +149,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> obj.navigation = new Navigation();
</span><span class="cx"> obj.navigation.render();
</span><span class="cx"> };
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommoncomponentspopupPopupViewjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/popup/PopupView.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/popup/PopupView.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/popup/PopupView.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,13 +22,14 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global $, define*/
</del><ins>+/*global define*/
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> */
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/components/popup/PopupView", [ \
</span><del>-], function() { </del><ins>+ "jquery"
+], function($) {
</ins><span class="cx">
</span><span class="cx"> var obj = {};
</span><span class="cx">
</span><span class="lines">@@ -56,7 +57,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> obj.show = function() {
</span><del>- $("#popup").show();
</del><ins>+ $("#popup").show();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> obj.hide = function() {
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonmainAbstractDelegatejs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractDelegate.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractDelegate.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractDelegate.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global $, define, _ */
</del><ins>+/*global define, _ */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author yaromin
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> obj.prototype.createEntity = function(id, objectParam, \
successCallback, errorCallback) { </span><del>- console.debug("create \
entity"); </del><ins>+ console.debug("create entity");
</ins><span class="cx"> var headers = {};
</span><span class="cx">
</span><span class="cx"> if (typeof id === "object" && id \
!== null) { </span><span class="lines">@@ -76,19 +76,19 @@
</span><span class="cx"> }
</span><span class="cx"> return this.serviceCall({url: "/" + \
id, </span><span class="cx"> type: "PUT",
</span><del>- success: successCallback,
- error: errorCallback,
</del><ins>+ success: successCallback,
+ error: errorCallback,
</ins><span class="cx"> data: JSON.stringify(objectParam),
</span><span class="cx"> headers: headers
</span><span class="cx"> });
</span><span class="cx"> } else {
</span><span class="cx"> return this.serviceCall({url: \
"?_action=create", </span><span class="cx"> type: \
"POST", </span><del>- success: successCallback,
- error: errorCallback,
</del><ins>+ success: successCallback,
+ error: errorCallback,
</ins><span class="cx"> data: JSON.stringify(objectParam),
</span><span class="cx"> headers: headers
</span><del>- });
</del><ins>+ });
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> callParams.headers["If-Match"] = \
'"' + data._rev + '"'; </span><span class="cx"> }
</span><span class="cx"> current.serviceCall(callParams);
</span><del>- }, errorCallback);
</del><ins>+ }, errorCallback);
</ins><span class="cx">
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -123,8 +123,8 @@
</span><span class="cx">
</span><span class="cx"> return this.serviceCall({url: "/" + id,
</span><span class="cx"> type: "PUT",
</span><del>- success: successCallback,
- error: errorCallback,
</del><ins>+ success: successCallback,
+ error: errorCallback,
</ins><span class="cx"> data: JSON.stringify(objectParam),
</span><span class="cx"> headers: headers
</span><span class="cx"> });
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> for(i = 0; i < patchDefinition.length; i++) {
</span><span class="cx"> if (typeof(patchDefinition[i].field) !== \
"undefined") { </span><span class="cx"> \
patchDefinition[i].field = "/" + patchDefinition[i].field; </span><del>- \
} </del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> return this.serviceCall({url: "/" + \
queryParameters.id, </span><span class="cx"> type: "PATCH",
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonmainAbstractViewjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractView.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractView.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/AbstractView.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,12 +22,15 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, Backbone, _, $, window */
</del><ins>+/*global define, window */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> */
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/main/AbstractView", [ </span><ins>+ \
"jquery", + "underscore",
+ "backbone",
</ins><span class="cx"> "org/forgerock/commons/ui/common/util/UIUtils",
</span><span class="cx"> \
"org/forgerock/commons/ui/common/main/ValidatorsManager", </span><span \
class="cx"> "org/forgerock/commons/ui/common/util/ValidatorsUtils", \
</span><span class="lines">@@ -36,7 +39,7 @@ </span><span class="cx"> \
"org/forgerock/commons/ui/common/main/Router", </span><span class="cx"> \
"org/forgerock/commons/ui/common/util/Constants", </span><span class="cx"> \
"ThemeManager" </span><del>-], function(uiUtils, validatorsManager, \
validatorsUtils, conf, eventManager, router, constants, themeManager) { \
</del><ins>+], function($, _, Backbone, uiUtils, validatorsManager, validatorsUtils, \
conf, eventManager, router, constants, themeManager) { </ins><span class="cx"> \
var View = Backbone.View.extend({ </span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -165,18 +168,17 @@
</span><span class="cx"> \
input.parents('.separate-message').addClass('invalid'); </span><span class="cx"> \
input.addClass('invalid'); </span><span class="cx"> } else {
</span><del>- \
input.parents('.separate-message').removeClass('invalid'); </del><ins>+ \
input.parents('.separate-message').removeClass('invalid'); </ins><span class="cx"> \
input.removeClass('invalid'); </span><span class="cx"> }
</span><del>-
-
</del><ins>+
</ins><span class="cx"> \
this.$el.find("div.validation-message[for='" + input.attr('name') + \
"']").html(msg ? msg : ''); </span><span class="cx">
</span><span class="cx"> if (validatorType) {
</span><span class="cx"> validatorsUtils.setErrors(this.$el, \
validatorType, msg); </span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><del>- this.$el.trigger("customValidate", [input, msg, \
validatorType]); </del><ins>+ \
this.$el.trigger("customValidate", [input, msg, validatorType]); \
</ins><span class="cx"> }, </span><span class="cx">
</span><span class="cx"> lock: function() {
</span><span class="lines">@@ -184,7 +186,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> unlock: function() {
</span><del>- this.formLock = false;
</del><ins>+ this.formLock = false;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> isFormLocked: function() {
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonmainErrorsHandlerjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ErrorsHandler.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ErrorsHandler.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ErrorsHandler.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,16 +22,17 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global require, define, _, $ */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> */
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/main/ErrorsHandler", [ \
</span><ins>+ "jquery", </ins><span class="cx"> \
"org/forgerock/commons/ui/common/main/AbstractConfigurationAware", \
</span><span class="cx"> \
"org/forgerock/commons/ui/common/main/EventManager", </span><span \
class="cx"> "org/forgerock/commons/ui/common/util/Constants" \
</span><del>-], function(AbstractConfigurationAware, eventManager, constants) { \
</del><ins>+], function($, AbstractConfigurationAware, eventManager, constants) { \
</ins><span class="cx"> var obj = new AbstractConfigurationAware(); </span><span \
class="cx"> </span><span class="cx"> obj.handleError = function(error, \
handlers) { </span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonmainEventManagerjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/EventManager.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/EventManager.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/EventManager.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,15 +22,15 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global $, define*/
</del><ins>+/*global define, document */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author yaromin
</span><span class="cx"> */
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/main/EventManager", [ </span><del>- \
"org/forgerock/commons/ui/common/util/Constants",
- "org/forgerock/commons/ui/common/util/CustomPolyfill"
-], function(constants) {
</del><ins>+ "jquery",
+ "org/forgerock/commons/ui/common/util/Constants"
+], function($, constants) {
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * listenerProxyMap - Association of real listeners and \
proxies which transforms parameter set </span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonmainGenericRouteInterfaceMapjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/GenericRouteInterfaceMap.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/GenericRouteInterfaceMap.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/GenericRouteInterfaceMap.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,14 +22,15 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, form2js, _, js2form, window, require */
</del><ins>+/*global define, require */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author huck.elliott
</span><span class="cx"> */
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/main/GenericRouteInterfaceMap", [ \
</span><del>-"org/forgerock/commons/ui/common/main/AbstractConfigurationAware"
-], function(AbstractConfigurationAware) {
</del><ins>+ "underscore",
+ "org/forgerock/commons/ui/common/main/AbstractConfigurationAware"
+], function(_, AbstractConfigurationAware) {
</ins><span class="cx"> var obj = new AbstractConfigurationAware();
</span><span class="cx"> //this module is a generic way of defining require js \
routes </span><span class="cx"> //another way of doing this same thing would be \
to add a route to app_root/main.js </span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonmainServiceInvokerjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ServiceInvoker.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ServiceInvoker.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ServiceInvoker.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,17 +22,18 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global $, define*/
</del><ins>+/*global define*/
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author yaromin
</span><span class="cx"> */
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/main/ServiceInvoker", [ \
</span><del>- "org/forgerock/commons/ui/common/util/Constants",
- "org/forgerock/commons/ui/common/main/EventManager",
</del><ins>+ "jquery",
+ "org/forgerock/commons/ui/common/util/Constants",
+ "org/forgerock/commons/ui/common/main/EventManager",
</ins><span class="cx"> \
"org/forgerock/commons/ui/common/util/ObjectUtil", </span><span class="cx"> \
"org/forgerock/commons/ui/common/main/AbstractConfigurationAware" \
</span><del>-], function(constants, em, objUtil, AbstractConfigurationAware) { \
</del><ins>+], function($, constants, em, objUtil, AbstractConfigurationAware) { \
</ins><span class="cx"> </span><span class="cx"> var obj = new \
AbstractConfigurationAware(); </span><span class="cx">
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonmainSessionManagerjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SessionManager.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SessionManager.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SessionManager.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global $, define, require */
</del><ins>+/*global define, require */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Interface
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonmainSpinnerManagerjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SpinnerManager.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SpinnerManager.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/SpinnerManager.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,14 +22,15 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global $, define, Spinner, window */
</del><ins>+/*global define, window */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> */
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/main/SpinnerManager", [ \
</span><ins>+ "jquery", </ins><span class="cx"> "spin"
</span><del>-], function(Spinner) {
</del><ins>+], function($, Spinner) {
</ins><span class="cx">
</span><span class="cx"> var obj = {};
</span><span class="cx">
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonmainUniversalCachedDelegatejs"></a>
<div class="delfile"><h4>Deleted: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/UniversalCachedDelegate.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/UniversalCachedDelegate.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/UniversalCachedDelegate.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -1,213 +0,0 @@
</span><del>-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2011-2012 ForgeRock AS. All rights reserved.
- *
- * The contents of this file are subject to the terms
- * of the Common Development and Distribution License
- * (the License). You may not use this file except in
- * compliance with the License.
- *
- * You can obtain a copy of the License at
- * http://forgerock.org/license/CDDLv1.0.html
- * See the License for the specific language governing
- * permission and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at http://forgerock.org/license/CDDLv1.0.html
- * If applicable, add the following below the CDDL Header,
- * with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- */
-
-/*global $, define*/
-
-/**
- * @author jdabrowski
- */
-define("org/forgerock/commons/ui/common/main/UniversalCachedDelegate", [
- "org/forgerock/commons/ui/common/main/UniversalDelegate"
-], function(universalDelegate) {
-
- var obj = {};
-
- obj.cache = {};
-
- obj.locks = {};
-
- obj.queue = {};
-
- obj.read = function(serviceUrl, id, successCallback, errorCallback) {
- if (!id) {
- if (errorCallback) {
- errorCallback("Not found for id = undefined");
- console.log("Not found for id = undefined");
- }
- return;
- }
- console.log("reading item");
- obj.get(serviceUrl, "read", "id", id, successCallback, \
errorCallback);
- };
-
- obj.readByName = function(serviceUrl, name, successCallback, errorCallback) {
- if (!name) {
- if (errorCallback) {
- errorCallback("Not found for name = undefined");
- console.log("Not found for name = undefined");
- }
- return;
- }
- console.log("reading item by name");
- obj.get(serviceUrl, "readByName", "name", name, \
successCallback, errorCallback);
- };
-
- obj.getAll = function(serviceUrl, successCallback, errorCallback) {
- console.log("reading all items");
- obj.get(serviceUrl, "getAll", null, null, successCallback, \
errorCallback);
- };
-
- obj.get = function(serviceUrl, methodName, tokenType, token, successCallback, \
errorCallback) {
- console.log("reading");
- var result = obj.getFromCache(serviceUrl, tokenType, token);
- if (result) {
- console.log("found in cache");
- successCallback(result);
- } else {
- console.log("NOT found in cache");
-
- if (obj.cacheNotEmpty(serviceUrl)) {
- console.log("item not found");
- if (errorCallback){
- errorCallback("Not found");
- }
- return;
- }
-
- if (obj.isLocked(serviceUrl)) {
- console.log("waiting on lock");
- obj.addRequestToQueue(methodName, serviceUrl, token, \
successCallback, errorCallback);
- } else {
- obj.createLock(serviceUrl);
- universalDelegate.getAll(serviceUrl, function(data) {
- console.log("getting all items from server");
- obj.loadToCache(serviceUrl, data);
- obj.removeLock(serviceUrl);
- result = obj.getFromCache(serviceUrl, tokenType, token);
- if (result) {
- successCallback(obj.getFromCache(serviceUrl, tokenType, \
token));
- } else {
- console.log("item not found");
- if (errorCallback){
- errorCallback("Not found");
- }
- }
- obj.raiseFromQueue(serviceUrl);
- }, function() {
- obj.removeLock(serviceUrl);
- if (errorCallback) {
- errorCallback();
- }
- obj.raiseFromQueue(serviceUrl);
- });
- }
- }
- };
-
-
-
-
- obj.update = function(serviceUrl, objectParam, successCallback, errorCallback) {
- universalDelegate.update(serviceUrl, objectParam, successCallback, \
errorCallback);
- };
-
- obj.create = function(serviceUrl, object , successCallback, errorCallback) {
- universalDelegate.create(serviceUrl, object , successCallback, \
errorCallback);
- };
-
- obj.remove = function(serviceUrl, id, successCallback, errorCallback) {
- universalDelegate.remove(serviceUrl, id, successCallback, errorCallback);
- };
-
-
-
- obj.cacheNotEmpty = function(serviceUrl, tokenType, token) {
- if (obj.cache[serviceUrl]) {
- return true;
- }
- return false;
- };
-
- obj.getFromCache = function(serviceUrl, tokenType, token) {
- if (!obj.cache[serviceUrl]) {
- return;
- }
-
- if (!tokenType) {
- return obj.cache[serviceUrl];
- }
-
- if (tokenType === 'id') {
- return obj.cache[serviceUrl][token];
- } else if (tokenType === 'name'){
- return obj.getFromCacheByName(serviceUrl, token);
- }
- };
-
- obj.getFromCacheByName = function(serviceUrl, name) {
- var cacheKey, item;
- for (cacheKey in obj.cache[serviceUrl]) {
- item = obj.cache[serviceUrl][cacheKey];
- if (item.name === name) {
- return item;
- }
- }
- };
-
- obj.loadToCache = function(serviceUrl, items) {
- obj.cache[serviceUrl] = {};
- var i;
- for (i = 0; i < items.length; i++) {
- obj.cache[serviceUrl][items[i]._id] = items[i];
- }
- console.log("items added to cache");
- };
-
- obj.addRequestToQueue = function(methodName, serviceUrl, token, successCallback, \
errorCallback) {
- if (!obj.queue[serviceUrl]) {
- obj.queue[serviceUrl] = [];
- }
- if (token) {
- obj.queue[serviceUrl].push([methodName, serviceUrl, token, \
successCallback, errorCallback]);
- } else {
- obj.queue[serviceUrl].push([methodName, serviceUrl, successCallback, \
errorCallback]);
- }
-
- };
-
- obj.raiseFromQueue = function(queueName) {
- var i, functionData, queueItems = obj.queue[queueName];
- if (queueItems) {
- while (queueItems.length > 0) {
- functionData = queueItems[0];
- queueItems.splice(0,1);
- obj[functionData[0]](queueName, \
functionData[2],functionData[3],functionData[4]);
- }
- }
- };
-
- obj.createLock = function(sourceName) {
- obj.locks[sourceName] = {};
- };
-
- obj.removeLock = function(sourceName) {
- delete obj.locks[sourceName];
- };
-
- obj.isLocked = function(sourceName) {
- return obj.locks[sourceName];
- };
-
- return obj;
-});
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonmainUniversalDelegatejs"></a>
<div class="delfile"><h4>Deleted: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/UniversalDelegate.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/UniversalDelegate.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/UniversalDelegate.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -1,83 +0,0 @@
</span><del>-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2011-2012 ForgeRock AS. All rights reserved.
- *
- * The contents of this file are subject to the terms
- * of the Common Development and Distribution License
- * (the License). You may not use this file except in
- * compliance with the License.
- *
- * You can obtain a copy of the License at
- * http://forgerock.org/license/CDDLv1.0.html
- * See the License for the specific language governing
- * permission and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at http://forgerock.org/license/CDDLv1.0.html
- * If applicable, add the following below the CDDL Header,
- * with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- */
-
-/*global $, define*/
-
-/**
- * @author jdabrowski
- */
-define("org/forgerock/commons/ui/common/main/UniversalDelegate", [
- "org/forgerock/commons/ui/common/util/Constants",
- "org/forgerock/commons/ui/common/main/ServiceInvoker"
-], function(constants, serviceInvoker) {
-
- var obj = {};
-
- obj.serviceCall = function(callParams) {
- callParams.url = constants.host + "/openidm/managed/" + \
callParams.url;
- serviceInvoker.restCall(callParams);
- };
-
- obj.create = function(serviceUrl, object , successCallback, errorCallback) {
- this.serviceCall({url: serviceUrl + "/1", type: "PUT", \
success: successCallback, error: errorCallback, data: \
JSON.stringify(object)});
- };
-
- obj.remove = function(serviceUrl, id, successCallback, errorCallback) {
- var current = this;
- this.read(serviceUrl, id, function(data) {
- var callParams = {url: serviceUrl + "/" + id, type: \
"DELETE", success: successCallback, error: errorCallback };
- if(data._rev) {
- callParams.headers = [];
- callParams.headers["If-Match"] = '"' + data._rev + \
'"';
- }
- current.serviceCall(callParams);
- }, errorCallback);
- };
-
- obj.read = function(serviceUrl, id, successCallback, errorCallback) {
- this.serviceCall({url: serviceUrl + "/" + id, type: \
"GET", success: successCallback, error: errorCallback});
- };
-
- obj.readByName = function(serviceUrl, name, successCallback, errorCallback) {
- obj.serviceCall({url: serviceUrl + \
"/?_queryId=get-"+serviceUrl+"-by-name&" + $.param({name: \
name}), success: function(data) {
- if(successCallback) {
- successCallback(data.result);
- }
- }, error: errorCallback} );
- };
-
- obj.getAll = function(serviceUrl, successCallback, errorCallback) {
- obj.serviceCall({url: serviceUrl + \
"/?_queryId=query-all-"+serviceUrl+"s", success: \
function(data) {
- if(successCallback) {
- successCallback(data.result);
- }
- }, error: errorCallback} );
- };
-
- obj.update = function(serviceUrl, objectParam, successCallback, errorCallback) {
- this.serviceCall({url: serviceUrl + "/" + objectParam._id, type: \
"POST", success: successCallback, error: errorCallback, data: \
objectParam});
- };
-
- return obj;
-});
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonmainValidatorsManagerjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ValidatorsManager.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ValidatorsManager.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ValidatorsManager.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,15 +22,17 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global require, define, form2js, _, $ */
</del><ins>+/*global require, define, form2js */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> */
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/main/ValidatorsManager", [ \
</span><ins>+ "jquery", + "underscore",
</ins><span class="cx"> \
"org/forgerock/commons/ui/common/main/AbstractConfigurationAware", \
</span><span class="cx"> \
"org/forgerock/commons/ui/common/util/ValidatorsUtils" </span><del>-], \
function(AbstractConfigurationAware, validatorUtils) { </del><ins>+], function($, _, \
AbstractConfigurationAware, validatorUtils) { </ins><span class="cx"> var obj = \
new AbstractConfigurationAware(); </span><span class="cx">
</span><span class="cx"> obj.bindValidators = function(el, baseEntity, callback) \
{ </span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonmainViewManagerjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ViewManager.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ViewManager.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/ViewManager.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,15 +22,16 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global require, define, _, $ */
</del><ins>+/*global require, define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> */
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/main/ViewManager", [ </span><ins>+ \
"underscore", </ins><span class="cx"> \
"org/forgerock/commons/ui/common/util/UIUtils", </span><span class="cx"> \
"org/forgerock/commons/ui/common/components/Messages" </span><del>-], \
function(uiUtils, msg) { </del><ins>+], function(_, uiUtils, msg) {
</ins><span class="cx"> var obj = {};
</span><span class="cx">
</span><span class="cx"> obj.currentView = "null";
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonmaini18nManagerjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/i18nManager.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/i18nManager.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/main/i18nManager.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,16 +22,17 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global require, define, _, $*/
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author jkigwana
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> define( \
"org/forgerock/commons/ui/common/main/i18nManager", [ </span><del>- \
"org/forgerock/commons/ui/common/util/Constants",
- "org/forgerock/commons/ui/common/util/UIUtils"
-], function(consts,uiUtils) {
</del><ins>+ "jquery",
+ "org/forgerock/commons/ui/common/util/Constants",
+ "org/forgerock/commons/ui/common/util/UIUtils"
+], function($, consts, uiUtils) {
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * i18nManger with i18next try to detect the user \
language and load the corresponding translation in the following order: </span><span \
class="lines">@@ -44,7 +45,7 @@ </span><span class="cx">
</span><span class="cx"> obj.init = function(lang) {
</span><span class="cx">
</span><del>- var locales = [], opts = { }, params = \
uiUtils.convertCurrentUrlToJSON().params; </del><ins>+ var locales = [], \
opts = { }, params = uiUtils.convertCurrentUrlToJSON().params; </ins><span \
class="cx"> </span><span class="cx"> if (params && params.locale) {
</span><span class="cx"> lang = params.locale;
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonutilFormGenerationUtilsjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/FormGenerationUtils.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/FormGenerationUtils.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/FormGenerationUtils.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,11 +22,12 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global $, define*/
</del><ins>+/*global define*/
</ins><span class="cx">
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/util/FormGenerationUtils", [ \
</span><del>- "org/forgerock/commons/ui/common/util/DateUtil" \
-], function (dateUtil) {
</del><ins>+ "jquery",
+ "org/forgerock/commons/ui/common/util/DateUtil"
+], function ($, dateUtil) {
</ins><span class="cx">
</span><span class="cx"> var obj = {};
</span><span class="cx">
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonutilUIUtilsjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/UIUtils.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/UIUtils.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/UIUtils.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,16 +22,19 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global $, define, window, Handlebars, i18n, _ , sessionStorage */
</del><ins>+/*global define, window, Handlebars, i18n, sessionStorage */
</ins><span class="cx"> /*jslint regexp: false*/
</span><ins>+
</ins><span class="cx"> \
define("org/forgerock/commons/ui/common/util/UIUtils", [ </span><ins>+ \
"jquery", + "underscore",
</ins><span class="cx"> \
"org/forgerock/commons/ui/common/util/typeextentions/String", </span><span \
class="cx"> "org/forgerock/commons/ui/common/main/AbstractConfigurationAware",
</span><span class="cx"> "handlebars",
</span><span class="cx"> "i18next",
</span><span class="cx"> "org/forgerock/commons/ui/common/main/Router",
</span><span class="cx"> \
"org/forgerock/commons/ui/common/util/DateUtil" </span><del>-], function \
(String, AbstractConfigurationAware, handlebars, i18next, router, dateUtil) { \
</del><ins>+], function ($, _, String, AbstractConfigurationAware, handlebars, \
i18next, router, dateUtil) { </ins><span class="cx"> var obj = new \
AbstractConfigurationAware(); </span><span class="cx">
</span><span class="cx"> obj.getUrl = function() {
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonutilValidatorsUtilsjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/ValidatorsUtils.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/ValidatorsUtils.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/ValidatorsUtils.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,10 +22,12 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global $, define, _ */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/util/ValidatorsUtils", [ \
</span><del>-], function() { </del><ins>+ "jquery",
+ "underscore"
+], function($, _) {
</ins><span class="cx"> var obj = {};
</span><span class="cx">
</span><span class="cx"> obj.namePattern = \
/^([A-Za'-\u0105\u0107\u0119\u0142\u00F3\u015B\u017C\u017A\u0104\u0106\u0118\u0141\u00 \
D3\u015A\u017B\u0179\u00C0\u00C8\u00CC\u00D2\u00D9\u00E0\u00E8\u00EC\u00F2\u00F9\u00C1 \
\u00C9\u00CD\u00D3\u00DA\u00DD\u00E1\u00E9\u00ED\u00F3\u00FA\u00FD\u00C2\u00CA\u00CE\u \
00D4\u00DB\u00E2\u00EA\u00EE\u00F4\u00FB\u00C3\u00D1\u00D5\u00E3\u00F1\u00F5\u00C4\u00 \
CB\u00CF\u00D6\u00DC\u0178\u00E4\u00EB\u00EF\u00F6\u00FC\u0178\u00A1\u00BF\u00E7\u00C7 \
\u0152\u0153\u00DF\u00D8\u00F8\u00C5\u00E5\u00C6\u00E6\u00DE\u00FE\u00D0\u00F0\-\s])+$/;
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonutilmainjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/main.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/main.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/util/main.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -25,10 +25,10 @@
</span><span class="cx"> /*global define*/
</span><span class="cx">
</span><span class="cx"> \
define("org/forgerock/commons/ui/common/util/main", [ \
</span><del>- "./Constants",
- "./UIUtils",
- "./ObjectUtil",
- "./ValidatorsUtils",
- "./typeextentions/String",
- "./CustomPolyfill"
</del><ins>+ "./Constants",
+ "./UIUtils",
+ "./ObjectUtil",
+ "./ValidatorsUtils",
+ "./typeextentions/String",
+ "./CustomPolyfill"
</ins><span class="cx"> ]);
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainresourcestemplatescommonDefaultBaseTemplatehtml"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/resources/templates/common/DefaultBaseTemplate.html \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/resources/templates/common/DefaultBaseTemplate.html 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/resources/templates/common/DefaultBaseTemplate.html 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> <div id="header">
</span><span class="cx">
</span><span class="cx"> <div id="logo" \
class="float-left"> </span><del>- <a href="#" \
title="{{theme.settings.logo.title}}"><img \
src="{{theme.settings.logo.src}}" \
width="{{theme.settings.logo.width}}" \
height="{{theme.settings.logo.height}}" \
alt="{{theme.settings.logo.alt}}" /> </a> </del><ins>+ \
<a href="#" title="{{theme.settings.logo.title}}"><img \
src="{{theme.settings.logo.src}}" style="{{#if \
theme.settings.logo.width}}width:{{theme.settings.logo.width}}{{/if}}{{#if \
theme.settings.logo.height}} height:{{theme.settings.logo.height}}px;{{/if}}" \
alt="{{theme.settings.logo.alt}}" /> </a> </ins><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainresourcestemplatescommonLoginBaseTemplatehtml"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/resources/templates/common/LoginBaseTemplate.html \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/resources/templates/common/LoginBaseTemplate.html 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/resources/templates/common/LoginBaseTemplate.html 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -1,13 +1,13 @@
</span><span class="cx"> <div id="login-base" \
class="base-wrapper"> </span><span class="cx">
</span><del>- <div id="header" >
- <div id="logo" class="float-left">
- <a href="#" \
title="{{theme.settings.logo.title}}">
- <img src="{{theme.settings.logo.src}}" \
width="{{theme.settings.logo.width}}" \
height="{{theme.settings.logo.height}}" \
alt="{{theme.settings.logo.alt}}" />
- </a>
- </div>
- </div>
</del><ins>+ <div id="header" >
+ <div id="logo" class="float-left">
+ <a href="#" \
title="{{theme.settings.logo.title}}"> + <img \
src="{{theme.settings.logo.src}}" style="{{#if \
theme.settings.logo.width}}width:{{theme.settings.logo.width}}{{/if}}{{#if \
theme.settings.logo.height}} height:{{theme.settings.logo.height}}px;{{/if}}" \
alt="{{theme.settings.logo.alt}}" /> + </a>
+ </div>
+ </div>
</ins><span class="cx">
</span><del>- <div id="content" \
class="content"></div> </del><ins>+ <div \
id="content" class="content"></div> </ins><span \
class="cx"> </div> </span><span class="cx">
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrcmainresourcestemplatescommonMediumBaseTemplatehtml"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/main/resources/templates/common/MediumBaseTemplate.html \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/main/resources/templates/common/MediumBaseTemplate.html 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/resources/templates/common/MediumBaseTemplate.html 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -1,12 +1,12 @@
</span><span class="cx"> <div id="medium-base" \
class="base-wrapper"> </span><span class="cx">
</span><del>- <div id="header">
- <div id="logo" class="float-left">
- <a href="#" \
title="{{theme.settings.logo.title}}">
- <img src="{{theme.settings.logo.src}}" \
width="{{theme.settings.logo.width}}" \
height="{{theme.settings.logo.height}}" \
alt="{{theme.settings.logo.alt}}" />
- </a>
- </div>
- </div>
</del><ins>+ <div id="header">
+ <div id="logo" class="float-left">
+ <a href="#" \
title="{{theme.settings.logo.title}}"> + <img \
src="{{theme.settings.logo.src}}" style="{{#if \
theme.settings.logo.width}}width:{{theme.settings.logo.width}}{{/if}}{{#if \
theme.settings.logo.height}} height:{{theme.settings.logo.height}}px;{{/if}}" \
alt="{{theme.settings.logo.alt}}" /> + </a>
+ </div>
+ </div>
</ins><span class="cx">
</span><del>- <div id="content" \
class="content"></div> </del><ins>+ <div \
id="content" class="content"></div> </ins><span \
class="cx"> </div> </span></span></pre></div>
<a id="forgerockuitrunkforgerockuimocksrcmainjsmainjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/main.js (2577 => 2578)</h4> <pre \
class="diff"><span> <span class="info">--- \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/main.js 2014-10-27 10:31:26 UTC (rev \
2577)
+++ forgerock-ui/trunk/forgerock-ui-mock/src/main/js/main.js 2014-10-28 22:35:46 UTC \
(rev 2578) </span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global require, _ */
</del><ins>+/*global require, window */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author yaromin
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> exports: "handlebars"
</span><span class="cx"> },
</span><span class="cx"> i18next: {
</span><del>- deps: ["handlebars"],
</del><ins>+ deps: ["jquery", "handlebars"],
</ins><span class="cx"> exports: "i18next"
</span><span class="cx"> },
</span><span class="cx"> moment: {
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> require([
</span><span class="cx"> // sinon only needed (or available) for Mock project
</span><span class="cx"> "sinon",
</span><ins>+ "jquery",
</ins><span class="cx"> "underscore",
</span><span class="cx"> "backbone",
</span><span class="cx"> "form2js",
</span><span class="lines">@@ -132,9 +133,14 @@
</span><span class="cx"> "UserDelegate",
</span><span class="cx"> "ThemeManager",
</span><span class="cx"> "config/main"
</span><del>-], function ( sinon, _, Backbone, form2js, js2form, spin, $ui, xdate, \
moment, doTimeout, Handlebars, i18n, </del><ins>+], function ( sinon, $, _, Backbone, \
form2js, js2form, spin, $ui, xdate, moment, doTimeout, Handlebars, i18n, </ins><span \
class="cx"> mockServer, i18nManager, constants, eventManager, \
localStorage) { </span><span class="cx">
</span><ins>+ // Helpers for the code that hasn't been properly migrated to \
require these as explicit dependencies: + window.$ = $;
+ window._ = _;
+ window.Backbone = Backbone;
+
</ins><span class="cx"> // Mock project is run without server. Framework requires \
cookies to be enabled in order to be able to login. </span><span class="cx"> // \
Default CookieHelper.cookiesEnabled() implementation will always return false as \
cookies cannot be set from local </span><span class="cx"> // file. Hence \
redefining function to return true </span></span></pre></div>
<a id="forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuicommondelegatesPolicyDelegatejs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/common/delegates/PolicyDelegate.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/common/delegates/PolicyDelegate.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/common/delegates/PolicyDelegate.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global $, define, _ */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author jdabrowski
</span><span class="lines">@@ -30,9 +30,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> \
define("org/forgerock/mock/ui/common/delegates/PolicyDelegate", [ \
</span><ins>+ "underscore", </ins><span class="cx"> \
"org/forgerock/commons/ui/common/util/Constants", </span><span class="cx"> \
"org/forgerock/commons/ui/common/main/AbstractDelegate" </span><del>-], \
function (constants, AbstractDelegate) { </del><ins>+], function (_, constants, \
AbstractDelegate) { </ins><span class="cx"> var obj = new \
AbstractDelegate("/policy"); </span><span class="cx">
</span><span class="cx"> obj.validateProperty = function (baseEntity, args, \
callback) { </span></span></pre></div>
<a id="forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuicommonutilThemeManagerjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/common/util/ThemeManager.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/common/util/ThemeManager.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/common/util/ThemeManager.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,16 +22,18 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, _, less */
</del><ins>+/*global define, less */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author Eugenia Sergueeva
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> define("ThemeManager", [
</span><ins>+ "jquery",
+ "underscore",
</ins><span class="cx"> \
"org/forgerock/commons/ui/common/util/Constants", </span><span class="cx"> \
"org/forgerock/commons/ui/common/main/Configuration" </span><del>-], \
function (constants, conf) { </del><ins>+], function ($, _, constants, conf) {
</ins><span class="cx"> var obj = {},
</span><span class="cx"> themePromise;
</span><span class="cx">
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuiuserLoginViewjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/LoginView.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/LoginView.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/LoginView.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,18 +22,19 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, form2js, _, js2form, window */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author huck.elliott
</span><span class="cx"> * @author Eugenia Sergueeva
</span><span class="cx"> */
</span><span class="cx"> define("org/forgerock/mock/ui/user/LoginView", [
</span><ins>+ "underscore",
</ins><span class="cx"> "org/forgerock/commons/ui/common/LoginView",
</span><span class="cx"> \
"org/forgerock/commons/ui/common/main/ValidatorsManager", </span><span \
class="cx"> "org/forgerock/commons/ui/common/main/Configuration", \
</span><span class="cx"> \
"org/forgerock/mock/ui/common/main/LocalStorage" </span><del>-], function \
(commonLoginView, validatorsManager, conf, localStorage) { </del><ins>+], function \
(_, commonLoginView, validatorsManager, conf, localStorage) { </ins><span class="cx"> \
var LoginView = function () { </span><span class="cx"> },
</span><span class="cx"> obj;
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuiuserTermsOfUseDialogjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/TermsOfUseDialog.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/TermsOfUseDialog.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/TermsOfUseDialog.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, _*/
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuiuserUserRegistrationViewjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/UserRegistrationView.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/UserRegistrationView.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/UserRegistrationView.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,13 +22,15 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, form2js, _, ContentFlow */
</del><ins>+/*global define, form2js */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> * @author Eugenia Sergueeva
</span><span class="cx"> */
</span><span class="cx"> \
define("org/forgerock/mock/ui/user/UserRegistrationView", [ </span><ins>+ \
"jquery", + "underscore",
</ins><span class="cx"> \
"org/forgerock/commons/ui/common/main/AbstractView", </span><span \
class="cx"> "org/forgerock/commons/ui/common/main/ValidatorsManager", \
</span><span class="cx"> \
"org/forgerock/commons/ui/common/util/UIUtils", </span><span \
class="lines">@@ -36,7 +38,7 @@ </span><span class="cx"> \
"org/forgerock/commons/ui/common/main/EventManager", </span><span \
class="cx"> "org/forgerock/commons/ui/common/util/Constants", \
</span><span class="cx"> \
"org/forgerock/commons/ui/common/main/Configuration" </span><del>-], \
function (AbstractView, validatorsManager, uiUtils, userDelegate, eventManager, \
constants, conf) { </del><ins>+], function ($, _, AbstractView, validatorsManager, \
uiUtils, userDelegate, eventManager, constants, conf) { </ins><span class="cx"> \
var UserRegistrationView = AbstractView.extend({ </span><span class="cx"> \
template: "templates/mock/UserRegistrationTemplate.html", </span><span \
class="cx"> baseTemplate: \
"templates/common/MediumBaseTemplate.html", </span></span></pre></div>
<a id="forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuiuserdelegatesUserDelegatejs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/delegates/UserDelegate.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/delegates/UserDelegate.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/delegates/UserDelegate.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global $, define, _ */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author yaromin
</span><span class="lines">@@ -30,12 +30,13 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> define("UserDelegate", [
</span><ins>+ "jquery",
</ins><span class="cx"> \
"org/forgerock/commons/ui/common/util/Constants", </span><span class="cx"> \
"org/forgerock/commons/ui/common/main/AbstractDelegate", </span><span \
class="cx"> "org/forgerock/commons/ui/common/main/Configuration", \
</span><span class="cx"> \
"org/forgerock/commons/ui/common/main/EventManager", </span><span \
class="cx"> "org/forgerock/mock/ui/common/main/LocalStorage" \
</span><del>-], function (constants, AbstractDelegate, configuration, eventManager, \
localStorage) { </del><ins>+], function ($, constants, AbstractDelegate, \
configuration, eventManager, localStorage) { </ins><span class="cx">
</span><span class="cx"> var obj = new \
AbstractDelegate("mock/repo/internal/user"); </span><span class="cx">
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuiuserprofileChangeSecurityDataDialogjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/profile/ChangeSecurityDataDialog.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/profile/ChangeSecurityDataDialog.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/profile/ChangeSecurityDataDialog.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,13 +22,15 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, _ */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> * @author Eugenia Sergueeva
</span><span class="cx"> */
</span><span class="cx"> \
define("org/forgerock/mock/ui/user/profile/ChangeSecurityDataDialog", [ \
</span><ins>+ "jquery", + "underscore",
</ins><span class="cx"> \
"org/forgerock/commons/ui/common/components/Dialog", </span><span \
class="cx"> "org/forgerock/commons/ui/common/main/ValidatorsManager", \
</span><span class="cx"> \
"org/forgerock/commons/ui/common/main/Configuration", </span><span \
class="lines">@@ -36,7 +38,7 @@ </span><span class="cx"> \
"org/forgerock/commons/ui/common/util/UIUtils", </span><span class="cx"> \
"org/forgerock/commons/ui/common/main/EventManager", </span><span \
class="cx"> "org/forgerock/commons/ui/common/util/Constants" \
</span><del>-], function (Dialog, validatorsManager, conf, userDelegate, uiUtils, \
eventManager, constants) { </del><ins>+], function ($, _, Dialog, validatorsManager, \
conf, userDelegate, uiUtils, eventManager, constants) { </ins><span class="cx"> \
var ChangeSecurityDataDialog = Dialog.extend({ </span><span class="cx"> \
contentTemplate: "templates/mock/ChangeSecurityDataDialogTemplate.html", \
</span><span class="cx"> </span></span></pre></div>
<a id="forgerockuitrunkforgerockuimocksrcmainjsorgforgerockmockuiuserprofileEnterOldPasswordDialogjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/profile/EnterOldPasswordDialog.js \
(2577 => 2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/profile/EnterOldPasswordDialog.js 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-mock/src/main/js/org/forgerock/mock/ui/user/profile/EnterOldPasswordDialog.js 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -22,18 +22,20 @@
</span><span class="cx"> * "Portions Copyrighted [year] [name of copyright \
owner]" </span><span class="cx"> */
</span><span class="cx">
</span><del>-/*global define, $, _, ContentFlow */
</del><ins>+/*global define */
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @author mbilski
</span><span class="cx"> */
</span><span class="cx"> \
define("org/forgerock/mock/ui/user/profile/EnterOldPasswordDialog", [ \
</span><ins>+ "jquery", + "underscore",
</ins><span class="cx"> \
"org/forgerock/commons/ui/common/components/Dialog", </span><span \
class="cx"> "org/forgerock/commons/ui/common/main/ValidatorsManager", \
</span><span class="cx"> \
"org/forgerock/commons/ui/common/main/Configuration", </span><span \
class="cx"> "org/forgerock/commons/ui/common/main/EventManager", \
</span><span class="cx"> \
"org/forgerock/commons/ui/common/util/Constants" </span><del>-], function \
(Dialog, validatorsManager, conf, eventManager, constants) { </del><ins>+], function \
($, _, Dialog, validatorsManager, conf, eventManager, constants) { </ins><span \
class="cx"> var EnterOldPasswordDialog = Dialog.extend({ </span><span class="cx"> \
contentTemplate: "templates/user/EnterOldPasswordDialog.html", </span><span \
class="cx"> </span></span></pre></div>
<a id="forgerockuitrunkforgerockuimocksrcmainresourcesindexhtml"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-mock/src/main/resources/index.html (2577 => \
2578)</h4> <pre class="diff"><span>
<span class="info">--- \
forgerock-ui/trunk/forgerock-ui-mock/src/main/resources/index.html 2014-10-27 \
10:31:26 UTC (rev 2577)
+++ forgerock-ui/trunk/forgerock-ui-mock/src/main/resources/index.html 2014-10-28 \
22:35:46 UTC (rev 2578) </span><span class="lines">@@ -19,9 +19,6 @@
</span><span class="cx"> <div id="dialog-background"></div>
</span><span class="cx"> <div id="dialogs"></div>
</span><span class="cx">
</span><del>-<script src="libs/jquery-1.11.1-min.js"></script>
-<script src="libs/lodash-2.4.1-min.js"></script>
-<script src="libs/backbone-1.1.2-min.js"></script>
</del><span class="cx"> <script data-main="main" \
src="libs/requirejs-2.1.14-min.js"></script> </span><span \
class="cx"> </span><span class="cx"> </body>
</span></span></pre>
</div>
</div>
<div id="footer">Copyright (c) by ForgeRock. All rights reserved.</div>
</body>
</html>
_______________________________________________
Commons mailing list
Commons@forgerock.org
https://lists.forgerock.org/mailman/listinfo/commons
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic