Menu
▾
▴
[Upstage-commits] SF.net SVN: upstage:[499] branches/2.4.2
|
From: <aut...@us...> - 2013-04-16 02:28:33
|
Revision: 499
http://upstage.svn.sourceforge.net/upstage/?rev=499&view=rev
Author: aut-upstage
Date: 2013-04-16 02:28:24 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Gavin - Created a conditional statement that displays the correct warning message when deleting media and actually deleting it in masterpage.js
- Removed a line of code in stageedit.xhtml that caused an error when accessing the stage edit page
Modified Paths:
--------------
branches/2.4.2/config/templates/stageedit.xhtml
branches/2.4.2/html/masterpage.js
Modified: branches/2.4.2/config/templates/stageedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/stageedit.xhtml 2013-04-11 02:09:42 UTC (rev 498)
+++ branches/2.4.2/config/templates/stageedit.xhtml 2013-04-16 02:28:24 UTC (rev 499)
@@ -17,6 +17,7 @@
- added the onstagelist checkbox, added text for it, added a heading for it as well.
- added an hidden input for the onstagelistMsg.
- added methods to the checkbox to call stageedit.js , so it can send message to server.
+Modified by Gavin Chan 16/04/2013 - Removed code that caused an error when accessing stage edit.
-->
<!include workshop_nav.inc>
<script type="text/javascript">
@@ -142,11 +143,10 @@
</td>
</tr>
<tr>
- <td><!--#(08/04/2013)Craig-->
- <input type="hidden" name="onstagelistMsg" id="onstagelistMsg" class="onstageMsg" value="%(onStageList)s"/>
+ <td><!--#(08/04/2013)Craig-->
+
<input type="hidden" name="debugTextMsg" id="debugTextMsg" class="debugMsg" value="%(debugMessages)s" />
<input type="hidden" name="colors" id="colorvals" value="%(colours)s"></input>
-
</td>
</tr>
</table>
@@ -157,7 +157,7 @@
<div id="submit">
<input type="hidden" name="action" value=""></input>
<table>
- <tr><!--#(08/04/2013)Craig-->
+ <tr>
<td style="width:0%;"><input type="button" onclick="seSaveOnly();" value="Save stage "></input></td>
<td style="width:0%;"><input type="button" onclick="saveStage(0);" value="Save and reload stage"></input></td>
<td colspan="3" style="width:50%;"><span id="warning">Warning: This will cause the stage to reload for everyone currently on it, and you will lose the chat log.</span></td>
@@ -177,4 +177,4 @@
<script type="text/javascript">stageEdit()</script>
</form>
</div>
-<!include master_b.inc>
+<!include master_b.inc>
\ No newline at end of file
Modified: branches/2.4.2/html/masterpage.js
===================================================================
--- branches/2.4.2/html/masterpage.js 2013-04-11 02:09:42 UTC (rev 498)
+++ branches/2.4.2/html/masterpage.js 2013-04-16 02:28:24 UTC (rev 499)
@@ -33,6 +33,7 @@
Modified by Gavin (6/3/2013): Changed actions[type] to actions[5] to also delete the media on warn(type) function.
Modified by Craig Farrell (09/04/2013) - changed back to actions[type] so all the stageEdit buttens work again
- changed embedmessage method name so it is more understandable. called it seSaveOnly();
+ Modified by Gavin (16/4/2013): Made a conditional statement to display the correct media warning message and delete the media.
*/
//Instance type variables
@@ -837,10 +838,16 @@
if(doIt)
{
// Vibhu and Karena (09/08/2011): Deselects selected media.
- if(type == 5 || type == 7)
+ if(type == 5)
{
mediaSelected = false;
}
+ // Gavin (16/4/13): Displays warning message of deleting media and also deletes the media
+ if(type == 7)
+ {
+ mediaSelected = false;
+ type = 5;
+ }
// Gavin (6/3/13): Changed actions[type] to actions[5] to also delete the media
document.getElementById("status").innerHTML = 'Sending to server, please wait...';
document.getElementById("status").style.display = "inline";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|