Showing the changes to Source/Libraries (2 of 2 files). Show all
Unified · Split
| @@ -199,6 +199,7 @@ namespace GSF.Threading · 198 unmodified lines | |||
| 199 | { | 199 | { |
| 200 | return token.GetTokenSource(); | 200 | return token.GetTokenSource(); |
| 201 | } | 201 | } |
| 202 | |||
| 202 | #endregion | 203 | #endregion |
| 203 | } | 204 | } |
| 204 | } | 205 | } |
| @@ -40,6 +40,14 @@ · 39 unmodified lines | |||
| 40 | // Setup page control scripts | 40 | // Setup page control scripts |
| 41 | StringBuilder pageControlScripts = ViewBag.PageControlScripts; | 41 | StringBuilder pageControlScripts = ViewBag.PageControlScripts; |
| 42 | 42 | ||
| 43 | pageControlScripts.AppendFormat(@" | ||
| 44 | <script> | ||
| 45 | $(""#titleText"").html(""{0}: <span data-bind='text: recordCount'>calculating...</span>""); | ||
| 46 | </script> | ||
| 47 | ", | ||
| 48 | ViewBag.RecordsTitle ?? "Records" | ||
| 49 | ); | ||
| 50 | |||
| 43 | pageControlScripts.Append(string.Format(@" | 51 | pageControlScripts.Append(string.Format(@" |
| 44 | <script src=""{0}""></script> | 52 | <script src=""{0}""></script> |
| 45 | <script src=""{1}""></script> | 53 | <script src=""{1}""></script> |
| @@ -108,8 +116,6 @@ · 62 unmodified lines | |||
| 108 | if (ViewBag.PageRecordsForEachBinding != null) { | 116 | if (ViewBag.PageRecordsForEachBinding != null) { |
| 109 | pageRecordsForEachBinding = ", " + ViewBag.PageRecordsForEachBinding; | 117 | pageRecordsForEachBinding = ", " + ViewBag.PageRecordsForEachBinding; |
| 110 | } | 118 | } |
| 111 | |||
| 112 | string recordsTitle = ViewBag.RecordsTitle ?? "Records"; | ||
| 113 | } | 119 | } |
| 114 | @functions | 120 | @functions |
| 115 | { | 121 | { |
| @@ -287,11 +293,6 @@ · 171 unmodified lines | |||
| 287 | "); | 293 | "); |
| 288 | } | 294 | } |
| 289 | 295 | ||
| 290 | pageControlScripts.AppendFormat(@" | ||
| 291 | $(""#titleText"").html(""{0}: <span data-bind='text: recordCount'>calculating...</span>"");", | ||
| 292 | recordsTitle | ||
| 293 | ); | ||
| 294 | |||
| 295 | if (showIsDeletedToggleLink) { | 296 | if (showIsDeletedToggleLink) { |
| 296 | if (showingDeletedRecords) { | 297 | if (showingDeletedRecords) { |
| 297 | pageControlScripts.AppendFormat(@" | 298 | pageControlScripts.AppendFormat(@" |