yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modified 3 dialogs to escape language-items containing single quote when inserted in javascript

Browse Source
This commit is contained in:
Peter@KASSA01.lan
2012-07-15 10:53:34 -02:00
parent ff5c705534
commit 63d6b05460
5 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/umbraco.presentation/umbraco/dialogs/insertTable.aspx
View File

@@ -284,7 +284,7 @@ function insertTable()
</TR></FORM>
</TABLE>
&nbsp;
<input type="button" class="guiInputButton" onClick="if (confirm('<%=umbraco.ui.Text("areyousure")%>')) window.close();" value="<%=umbraco.ui.Text("cancel")%>"> &nbsp;
<input type="button" class="guiInputButton" onClick="if (confirm('<%=umbraco.ui.Text("areyousure").Replace("'", "\\'")%>')) window.close();" value="<%=umbraco.ui.Text("cancel")%>"> &nbsp;
<input type="button" class="guiInputButton" onClick="insertTable()" value="<%=umbraco.ui.Text("insert")%>">
</body>
</HTML>

9
src/umbraco.presentation/umbraco/dialogs/insertTable.aspx.designer.cs generated
View File

@@ -1,22 +1,15 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.312
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace umbraco.dialogs {
/// <summary>
/// insertTable class.
/// </summary>
/// <remarks>
/// Auto-generated class.
/// </remarks>
public partial class insertTable {
/// <summary>

4
src/umbraco.presentation/umbraco/dialogs/publish.aspx
View File

@@ -20,7 +20,7 @@
}
function showPublication() {
var statusStr = '<%=umbraco.ui.Text("inProgressCounter")%>';
var statusStr = '<%=umbraco.ui.Text("inProgressCounter").Replace("'", "\\'")%>';
document.getElementById("counter").innerHTML = statusStr.replace('%0%', '0').replace('%1%', pubTotal);
document.getElementById('formDiv').style.display = 'none';
document.getElementById('animDiv').style.display = 'block';
@@ -37,7 +37,7 @@
}
function updatePublicationDo(retVal) {
var statusStr = '<%=umbraco.ui.Text("inProgressCounter")%>';
var statusStr = '<%=umbraco.ui.Text("inProgressCounter").Replace("'", "\\'")%>';
document.getElementById("counter").innerHTML = statusStr.replace('%0%', retVal).replace('%1%', pubTotal);
setTimeout("updatePublication()", 200);
}

3
src/umbraco.presentation/umbraco/dialogs/publish.aspx.designer.cs generated
View File

@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4200
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

2
src/umbraco.presentation/umbraco/dialogs/sort.aspx
View File

@@ -83,7 +83,7 @@
<br />
<p>
<input type="button" onclick="sort(); return false;" value='<%=umbraco.ui.Text("save") %>' />
<input type="button" onclick="sort(); return false;" value="<%=umbraco.ui.Text("save") %>" />
<em> or </em><a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
</p>
</div>