CC-3174 : showbuilder
dragging into timeline is working need to replace jjmenus
This commit is contained in:
parent
8b93b98e24
commit
0199f572bd
7 changed files with 473 additions and 123 deletions
|
@ -44,7 +44,7 @@
|
|||
{
|
||||
global.click(
|
||||
function(event) {
|
||||
if (this == event.currentTarget) {
|
||||
if (this == event.target) {
|
||||
global.pageX = event.pageX;
|
||||
global.pageY = event.pageY;
|
||||
event.preventDefault();
|
||||
|
@ -84,16 +84,6 @@
|
|||
|
||||
dynamicItems = true;
|
||||
$.getJSON(uReplace(param[i].get), function(data) {
|
||||
/* jjmenu doesn't provide ability to add callback function
|
||||
in case of error. So the error handling has to be included in
|
||||
the library itself */
|
||||
if(data.show_error == true){
|
||||
alert("The show instance doesn't exist anymore!");
|
||||
window.location.reload();
|
||||
}else if(data.playlist_error == true){
|
||||
alert("The playlist doesn't exist anymore!");
|
||||
window.location.reload();
|
||||
}
|
||||
for (var ii in data) {
|
||||
putItem(data[ii]);
|
||||
}
|
||||
|
@ -295,8 +285,6 @@
|
|||
/* do action on menu item */
|
||||
function doAction(act) {
|
||||
|
||||
$("#jjmenu_main").hide();
|
||||
|
||||
if (act) {
|
||||
|
||||
switch (act.type) {
|
||||
|
@ -314,7 +302,7 @@
|
|||
|
||||
case "ajax":
|
||||
$.getJSON(uReplace(act.url), function(data) {
|
||||
|
||||
|
||||
var cb = eval(act.callback);
|
||||
if (typeof(cb) == "function") {
|
||||
cb(data);
|
||||
|
@ -374,4 +362,4 @@
|
|||
} // !menu
|
||||
};
|
||||
|
||||
})(jQuery);
|
||||
})(jQuery);
|
Loading…
Add table
Add a link
Reference in a new issue