Merge branch 'p710' into p720

farcrycore · Oct 2, 2015 · 0b6af1a · 0b6af1a
2 parents 6124666 + 7a990b3
commit 0b6af1a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/packages/formtools/longchar.cfc b/packages/formtools/longchar.cfc
@@ -171,7 +171,7 @@
 							<textarea name="#arguments.fieldname#" id="#arguments.fieldname#" class="textareaInput #arguments.inputClass# #arguments.stMetadata.ftclass#" style="#arguments.stMetadata.ftstyle#" placeholder="#arguments.stMetadata.ftPlaceholder#">#arguments.stMetadata.value#</textarea>
 							<cfif isBoolean(arguments.stMetadata.ftLimit) and arguments.stMetadata.ftLimit>
 								<div style="clear:both;" id="dm_ct_Text_#arguments.fieldname#"><span id="dm_ct_countDown_#arguments.fieldname#">#len(arguments.stMetadata.value)#</span>/#arguments.stMetadata.ftLimit# <span id="dm_ct_overage_#arguments.fieldname#" style="color:red;display:none;">#arguments.stMetadata.ftLimitWarning#</span></div> 
-								<script type="text/javascript">$j("###arguments.fieldname#").keydown(function(e){ updateLoncharCounter("#arguments.fieldname#", #arguments.stMetadata.ftLimit#, "#arguments.stMetadata.ftLimitOverage#", e.keyCode) });</script>
+								<script type="text/javascript">$j("###arguments.fieldname#").on("change keydown", function(e){ updateLoncharCounter("#arguments.fieldname#", #arguments.stMetadata.ftLimit#, "#arguments.stMetadata.ftLimitOverage#", e.keyCode)});</script>
 							</cfif>
 						</div>
 					</div>

diff --git a/tags/webskin/genericNav.cfm b/tags/webskin/genericNav.cfm
@@ -198,7 +198,7 @@ else {
 				if(attributes.bLast and qNav.nRight[i] eq qMaxRight.maxRight){
 					itemclass=itemclass & '#attributes.lastClass# ';
 				}
-				if(attributes.bActive and (trim(qNav.ObjectID[i]) eq request.sectionObjectID or listfind(lAncestors, trim(qNav.ObjectID[i])))){
+				if(attributes.bActive and (trim(qNav.ObjectID[i]) eq attributes.sectionObjectID or listfind(lAncestors, trim(qNav.ObjectID[i])))){
 					itemclass=itemclass & '#attributes.activeClass# ';
 				}
 				// update counters
@@ -229,7 +229,7 @@ else {
 						}				
 						
 						writeOutput("<li");
-						if(request.sectionObjectID eq application.fapi.getNavID(attributes.homeAlias)){
+						if(attributes.sectionObjectID eq application.fapi.getNavID(attributes.homeAlias)){
 							homeclass=homeclass & ' #attributes.ActiveClass# ';
 						}
 						writeOutput(" class="""&trim(homeclass)&"""");
@@ -313,7 +313,7 @@ else {
 			writeOutput(">");
 						
 			writeOutput("<li");
-			if(request.sectionObjectID eq application.fapi.getNavID('home'))
+			if(attributes.sectionObjectID eq application.fapi.getNavID('home'))
 			{
 				writeOutput(" class=""active""");
 			}

diff --git a/webskin/dmProfile/displaySummaryOptionsCLIENTUD.cfm b/webskin/dmProfile/displaySummaryOptionsCLIENTUD.cfm
@@ -6,7 +6,7 @@
 <cfimport taglib="/farcry/core/tags/admin" prefix="admin" />
 
 <cfoutput>
-	<li><a href="#application.url.webtop#?id=dashboard&typename=farUser&bodyView=editOwnPassword"><admin:resource key="coapi.farUser.general.changepassword">Change password</admin:resource></a></li>
+	<li><a href="#application.url.webtop#/?id=dashboard&typename=farUser&bodyView=editOwnPassword"><admin:resource key="coapi.farUser.general.changepassword">Change password</admin:resource></a></li>
 </cfoutput>
 
 <cfsetting enablecfoutputonly="false" />
diff --git a/webskin/types/webtopHeader.cfm b/webskin/types/webtopHeader.cfm
@@ -95,7 +95,7 @@
 							<b class="fa fa-caret-down"></b>
 						</div>
 						<ul class="dropdown-menu pull-right">
-							<li><a href="#application.url.webtop#?id=dashboard&typename=dmProfile&objectid=#session.dmProfile.objectid#&bodyView=editOwn"><admin:resource key="coapi.dmProfile.general.editprofile">Edit Profile</admin:resource></a></li>
+							<li><a href="#application.url.webtop#/?id=dashboard&typename=dmProfile&objectid=#session.dmProfile.objectid#&bodyView=editOwn"><admin:resource key="coapi.dmProfile.general.editprofile">Edit Profile</admin:resource></a></li>
 							</cfoutput>
 								<skin:view typename="dmProfile" stObject="#session.dmProfile#" webskin="displaySummaryOptions#session.dmProfile.userdirectory#" alternateHTML="" />
 							<cfoutput>
@@ -114,7 +114,7 @@
 								</cfloop>
 							</cfif>
 							<li class="divider"></li>
-							<li><a href="#application.url.webtop#?logout=1"><admin:resource key="coapi.dmProfile.general.logout">Logout</admin:resource></a></li>
+							<li><a href="#application.url.webtop#/?logout=1"><admin:resource key="coapi.dmProfile.general.logout">Logout</admin:resource></a></li>
 						</ul>
 					</div>
 				</div>