[prev in list] [next in list] [prev in thread] [next in thread]
List: forgerock-commons
Subject: [Commons] [2145] forgerock-ui/trunk/forgerock-ui-commons/src: CUI-15 - Fix for the dialog action but
From: noreply () forgerock ! org
Date: 2014-06-26 15:46:13
Message-ID: 20140626154613.C3F7C408FD () 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>[2145] forgerock-ui/trunk/forgerock-ui-commons/src: CUI-15 - Fix for the \
dialog action buttons being added and duplicated ( Code Review: CR-3873 )</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=2145">2145</a></dd> \
<dt>Author</dt> <dd>jason.browne</dd> <dt>Date</dt> <dd>2014-06-26 16:46:13 +0100 \
(Thu, 26 Jun 2014)</dd> </dl>
<h3>Log Message</h3>
<pre>CUI-15 - Fix for the dialog action buttons being added and duplicated ( Code \
Review: CR-3873 )</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#forgerockuitrunkforgerockuicommonssrcmainjsorgforgerockcommonsuicommonco \
mponentsDialogjs">forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Dialog.js</a></li>
<li><a href="#forgerockuitrunkforgerockuicommonssrctestqunitcommonsjs">forgerock-ui/trunk/forgerock-ui-commons/src/test/qunit/commons.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 \
(2144 => 2145)</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-06-23 \
16:22:34 UTC (rev 2144)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/main/js/org/forgerock/commons/ui/common/components/Dialog.js 2014-06-26 \
15:46:13 UTC (rev 2145) </span><span class="lines">@@ -114,10 +114,19 @@
</span><span class="cx"> this.$el.remove();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> addAction: function(name, type) {
</span><del>- this.actions.push({
- "name" : name,
- "type" : type
</del><ins>+ if(!this.getAction(name)) {
+ this.actions.push({
+ "name" : name,
+ "type" : type
+ });
+ }
+ },
+
+ getAction: function(name) {
+ return _.find(this.actions, function(a) {
+ return a.name === name;
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="forgerockuitrunkforgerockuicommonssrctestqunitcommonsjs"></a>
<div class="modfile"><h4>Modified: \
forgerock-ui/trunk/forgerock-ui-commons/src/test/qunit/commons.js (2144 => 2145)</h4> \
<pre class="diff"><span> <span class="info">--- \
forgerock-ui/trunk/forgerock-ui-commons/src/test/qunit/commons.js 2014-06-23 16:22:34 \
UTC (rev 2144)
+++ forgerock-ui/trunk/forgerock-ui-commons/src/test/qunit/commons.js 2014-06-26 \
15:46:13 UTC (rev 2145) </span><span class="lines">@@ -26,8 +26,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> define([
</span><del>- "org/forgerock/commons/ui/common/main/Configuration"
-], function (conf) {
</del><ins>+ "org/forgerock/commons/ui/common/main/Configuration",
+ "org/forgerock/commons/ui/common/components/Dialog"
+], function (conf, Dialog) {
</ins><span class="cx"> return {
</span><span class="cx"> executeAll: function (server, parameters) {
</span><span class="cx">
</span><span class="lines">@@ -88,6 +89,18 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ QUnit.test("Add Actions to Dialog", function () {
+ var testDialog = new Dialog();
+
+ QUnit.ok(testDialog.actions.length === 1 && \
testDialog.actions[0].name === "close", "Cancel Button is \
Available"); +
+ testDialog.addAction("Test", "TestValue");
+ testDialog.addAction("Test", "TestValue");
+
+ QUnit.ok(testDialog.actions.length === 2 && \
testDialog.actions[0].name === "close" && \
testDialog.actions[1].name === "Test", "Cancel and Test Buttons are \
Available"); +
+ });
+
</ins><span class="cx"> return testPromise;
</span><span class="cx"> }
</span><span class="cx"> };
</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