API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Sep 5th, 2012
127
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.61 KB | None | 0 0
raw download clone embed print report
  1. diff -rupN WEB-INF//jsp/importPlaylist.jsp WEB-INF-gaco//jsp/importPlaylist.jsp
  2. --- WEB-INF//jsp/importPlaylist.jsp 2012-06-03 14:37:16.000000000 +0200
  3. +++ WEB-INF-gaco//jsp/importPlaylist.jsp 2012-09-06 03:43:17.000000000 +0200
  4. @@ -14,7 +14,7 @@
  5. <p>
  6. <fmt:message key="importPlaylist.success"><fmt:param value="${model.playlist.name}"/></fmt:message>
  7. <script type="text/javascript" language="javascript">
  8. - top.left.updatePlaylists();
  9. + parent.left.updatePlaylists();
  10. </script>
  11. </p>
  12. </c:if>
  13. diff -rupN WEB-INF//jsp/main.jsp WEB-INF-gaco//jsp/main.jsp
  14. --- WEB-INF//jsp/main.jsp 2012-09-04 17:55:26.000000000 +0200
  15. +++ WEB-INF-gaco//jsp/main.jsp 2012-09-06 03:43:17.000000000 +0200
  16. @@ -130,7 +130,7 @@
  17. mediaFileIds.push($("#songId" + i).html());
  18. }
  19. }
  20. - playlistService.appendToPlaylist(playlistId, mediaFileIds, function (){top.left.updatePlaylists();});
  21. + playlistService.appendToPlaylist(playlistId, mediaFileIds, function (){parent.left.updatePlaylists();});
  22. }
  23.  
  24. function RefreshMediaType() {
  25. @@ -217,9 +217,9 @@ function RefreshMediaType() {
  26.  
  27. <c:if test="${model.user.streamRole}">
  28. <c:if test="${needSep}">|</c:if>
  29. - <a href="#" onclick="top.playQueue.onPlay(${model.dir.id});"><fmt:message key="main.playall"/></a> |
  30. - <a href="#" onclick="top.playQueue.onPlayRandom(${model.dir.id}, 10);"><fmt:message key="main.playrandom"/></a> |
  31. - <a href="#" onclick="top.playQueue.onAdd(${model.dir.id});"><fmt:message key="main.addall"/></a>
  32. + <a href="#" onclick="parent.playQueue.onPlay(${model.dir.id});"><fmt:message key="main.playall"/></a> |
  33. + <a href="#" onclick="parent.playQueue.onPlayRandom(${model.dir.id}, 10);"><fmt:message key="main.playrandom"/></a> |
  34. + <a href="#" onclick="parent.playQueue.onAdd(${model.dir.id});"><fmt:message key="main.addall"/></a>
  35. <c:set var="needSep" value="true"/>
  36. </c:if>
  37.  
  38. diff -rupN WEB-INF//jsp/playAddDownload.jsp WEB-INF-gaco//jsp/playAddDownload.jsp
  39. --- WEB-INF//jsp/playAddDownload.jsp 2012-09-03 22:04:20.000000000 +0200
  40. +++ WEB-INF-gaco//jsp/playAddDownload.jsp 2012-09-06 03:44:06.000000000 +0200
  41. @@ -44,13 +44,13 @@ PARAMETERS
  42. <c:if test="${param.asTable}"></td><td></c:if>
  43. </c:when>
  44. <c:otherwise>
  45. - <a href="#" onclick="top.playQueue.onPlay(${param.id});">
  46. + <a href="#" onclick="parent.playQueue.onPlay(${param.id});">
  47. <img src="<spring:theme code="playImage"/>" alt="<fmt:message key="common.play"/>" title="<fmt:message key="common.play"/>"></a>
  48.  
  49. <c:if test="${param.asTable}"></td><td></c:if>
  50.  
  51. <c:if test="${empty param.playAddEnabled or param.playAddEnabled}">
  52. - <a href="#" onclick="top.playQueue.onPlayAdd('${param.id}');">
  53. + <a href="#" onclick="parent.playQueue.onPlayAdd('${param.id}');">
  54. <img src="<spring:theme code="playAddImage"/>" alt="<fmt:message key="common.playadd"/>" title="<fmt:message key="common.playadd"/>"></a>
  55. </c:if>
  56. </c:otherwise>
  57. @@ -59,7 +59,7 @@ PARAMETERS
  58.  
  59. <c:if test="${param.asTable}"><td></c:if>
  60. <c:if test="${(empty param.addEnabled or param.addEnabled) and not param.video}">
  61. - <a href="#" onclick="top.playQueue.onAdd(${param.id});">
  62. + <a href="#" onclick="parent.playQueue.onAdd(${param.id});">
  63. <img src="<spring:theme code="addImage"/>" alt="<fmt:message key="common.add"/>" title="<fmt:message key="common.add"/>"></a>
  64. </c:if>
  65. <c:if test="${param.asTable}"></td></c:if>
  66. diff -rupN WEB-INF//jsp/playlist.jsp WEB-INF-gaco//jsp/playlist.jsp
  67. --- WEB-INF//jsp/playlist.jsp 2012-08-01 17:39:32.000000000 +0200
  68. +++ WEB-INF-gaco//jsp/playlist.jsp 2012-09-06 03:43:17.000000000 +0200
  69. @@ -24,7 +24,7 @@
  70. var isPublic = $("#newPublic").is(":checked");
  71. $("#name").html(name);
  72. $("#comment").html(comment);
  73. - playlistService.updatePlaylist(playlist.id, name, comment, isPublic, function (playlistInfo){playlistCallback(playlistInfo); top.left.updatePlaylists()});
  74. + playlistService.updatePlaylist(playlist.id, name, comment, isPublic, function (playlistInfo){playlistCallback(playlistInfo); parent.left.updatePlaylists()});
  75. },
  76. "<fmt:message key="common.cancel"/>": function() {
  77. $(this).dialog("close");
  78. @@ -35,7 +35,7 @@
  79. buttons: {
  80. "<fmt:message key="common.delete"/>": function() {
  81. $(this).dialog("close");
  82. - playlistService.deletePlaylist(playlist.id, function (){top.left.updatePlaylists(); location = "home.view";});
  83. + playlistService.deletePlaylist(playlist.id, function (){parent.left.updatePlaylists(); location = "home.view";});
  84. },
  85. "<fmt:message key="common.cancel"/>": function() {
  86. $(this).dialog("close");
  87. @@ -118,19 +118,19 @@
  88. }
  89.  
  90. function onPlay(index) {
  91. - top.playQueue.onPlay(songs[index].id);
  92. + parent.playQueue.onPlay(songs[index].id);
  93. }
  94. function onPlayAll() {
  95. - top.playQueue.onPlayPlaylist(playlist.id);
  96. + parent.playQueue.onPlayPlaylist(playlist.id);
  97. }
  98. function onAdd(index) {
  99. - top.playQueue.onAdd(songs[index].id);
  100. + parent.playQueue.onAdd(songs[index].id);
  101. }
  102. function onStar(index) {
  103. playlistService.toggleStar(playlist.id, index, playlistCallback);
  104. }
  105. function onRemove(index) {
  106. - playlistService.remove(playlist.id, index, function (playlistInfo){playlistCallback(playlistInfo); top.left.updatePlaylists()});
  107. + playlistService.remove(playlist.id, index, function (playlistInfo){playlistCallback(playlistInfo); parent.left.updatePlaylists()});
  108. }
  109. function onUp(index) {
  110. playlistService.up(playlist.id, index, playlistCallback);
  111. diff -rupN WEB-INF//jsp/playQueue.jsp WEB-INF-gaco//jsp/playQueue.jsp
  112. --- WEB-INF//jsp/playQueue.jsp 2012-09-04 16:55:48.000000000 +0200
  113. +++ WEB-INF-gaco//jsp/playQueue.jsp 2012-09-06 03:43:17.000000000 +0200
  114. @@ -287,7 +287,7 @@
  115. }
  116. function onSavePlaylist() {
  117. playQueueService.savePlaylist(function () {
  118. - top.left.updatePlaylists();
  119. + parent.left.updatePlaylists();
  120. $().toastmessage("showSuccessToast", "<fmt:message key="playlist.toast.saveasplaylist"/>");
  121. });
  122. }
  123. @@ -312,7 +312,7 @@
  124. }
  125. }
  126. playlistService.appendToPlaylist(playlistId, mediaFileIds, function (){
  127. - top.left.updatePlaylists();
  128. + parent.left.updatePlaylists();
  129. $().toastmessage("showSuccessToast", "<fmt:message key="playlist.toast.appendtoplaylist"/>");
  130. });
  131. }
  132. diff -rupN WEB-INF//jsp/radio.jsp WEB-INF-gaco//jsp/radio.jsp
  133. --- WEB-INF//jsp/radio.jsp 2012-08-07 19:59:20.000000000 +0200
  134. +++ WEB-INF-gaco//jsp/radio.jsp 2012-09-06 03:43:17.000000000 +0200
  135. @@ -79,7 +79,7 @@ function playGenreRadio() {
  136. var num = document.getElementsByName("GenreRadioPlayCount")[0].selectedIndex;
  137. var playcount = document.getElementsByName("GenreRadioPlayCount")[0].options[num].text;
  138.  
  139. - top.playQueue.onPlayGenreRadio(genres, playcount);
  140. + parent.playQueue.onPlayGenreRadio(genres, playcount);
  141. }
  142. </script>
  143. </head>
  144. diff -rupN WEB-INF//jsp/top.jsp WEB-INF-gaco//jsp/top.jsp
  145. --- WEB-INF//jsp/top.jsp 2012-08-08 20:29:32.000000000 +0200
  146. +++ WEB-INF-gaco//jsp/top.jsp 2012-09-06 03:43:17.000000000 +0200
  147. @@ -133,7 +133,7 @@
  148.  
  149. <td style="padding-left:15pt;text-align:center;">
  150. <p class="detail" style="line-height:1.5">
  151. - <a href="j_acegi_logout" target="_top"><img src="<spring:theme code="logoffImage"/>" title="<fmt:message key="top.logout"><fmt:param value="${model.user.username}"/></fmt:message>" alt="<fmt:message key="top.logout"><fmt:param value="${model.user.username}"/></fmt:message>"></a>
  152. + <a href="j_acegi_logout" target="_parent"><img src="<spring:theme code="logoffImage"/>" title="<fmt:message key="top.logout"><fmt:param value="${model.user.username}"/></fmt:message>" alt="<fmt:message key="top.logout"><fmt:param value="${model.user.username}"/></fmt:message>"></a>
  153. <c:if test="${not model.licensed}">
  154. <br>
  155. <a href="donate.view" target="main"><img src="<spring:theme code="donateSmallImage"/>" alt=""></a>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!