Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'CC-3174' into devel

Browse source
This commit is contained in:
Naomi Aro 2012-04-16 16:40:02 +02:00
commit a0fb607d30
16 changed files with 210 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View file

@ -34,7 +34,7 @@ var AIRTIME = (function(AIRTIME){
.data("screen", "timeline");
};
mod.fnDrawCallback = function() {
mod.fnDrawCallback = function fnLibDrawCallback() {
$('#library_display tr:not(:first)').draggable({
helper: function(){

49
airtime_mvc/public/js/airtime/library/library.js
View file

@ -118,28 +118,21 @@ var AIRTIME = (function(AIRTIME) {
},
"fnStateSave": function (oSettings, oData) {
$.ajax({
url: "/usersettings/set-library-datatable",
type: "POST",
data: {settings : oData, format: "json"},
dataType: "json"
});
localStorage.setItem('datatables-library', JSON.stringify(oData));
$.ajax({
url: "/usersettings/set-library-datatable",
type: "POST",
data: {settings : oData, format: "json"},
dataType: "json"
});
},
"fnStateLoad": function (oSettings) {
var o;
$.ajax({
url: "/usersettings/get-library-datatable",
type: "GET",
data: {format: "json"},
dataType: "json",
async: false,
success: function(json){
o = json.settings;
}
});
return o;
"fnStateLoad": function fnLibStateLoad(oSettings) {
var settings = localStorage.getItem('datatables-library');
if (settings !== "") {
return JSON.parse(settings);
}
},
"fnStateLoadParams": function (oSettings, oData) {
var i,
@ -148,13 +141,17 @@ var AIRTIME = (function(AIRTIME) {
//putting serialized data back into the correct js type to make
//sure everything works properly.
for (i = 0, length = a.length; i < length; i++) {
a[i] = (a[i] === "true") ? true : false;
for (i = 0, length = a.length; i < length; i++) {
if (typeof(a[i]) === "string") {
a[i] = (a[i] === "true") ? true : false;
}
}
a = oData.ColReorder;
for (i = 0, length = a.length; i < length; i++) {
a[i] = parseInt(a[i], 10);
for (i = 0, length = a.length; i < length; i++) {
if (typeof(a[i]) === "string") {
a[i] = parseInt(a[i], 10);
}
}
oData.iEnd = parseInt(oData.iEnd, 10);
@ -516,7 +513,7 @@ var AIRTIME = (function(AIRTIME) {
return AIRTIME;
}(AIRTIME || {}));
function checkImportStatus(){
$.getJSON('/Preference/is-import-in-progress', function(data){
var div = $('#import_status');

69
airtime_mvc/public/js/airtime/showbuilder/builder.js
View file

@ -177,8 +177,10 @@ var AIRTIME = (function(AIRTIME){
delete oData.oSearch;
delete oData.aoSearchCols;
},
"fnStateSave": function (oSettings, oData) {
"fnStateSave": function fnStateSave(oSettings, oData) {
localStorage.setItem('datatables-timeline', JSON.stringify(oData));
$.ajax({
url: "/usersettings/set-timeline-datatable",
type: "POST",
@ -186,21 +188,12 @@ var AIRTIME = (function(AIRTIME){
dataType: "json"
});
},
"fnStateLoad": function (oSettings) {
var o;
$.ajax({
url: "/usersettings/get-timeline-datatable",
type: "GET",
data: {format: "json"},
dataType: "json",
async: false,
success: function(json){
o = json.settings;
}
});
return o;
"fnStateLoad": function fnBuilderStateLoad(oSettings) {
var settings = localStorage.getItem('datatables-timeline');
if (settings !== "") {
return JSON.parse(settings);
}
},
"fnStateLoadParams": function (oSettings, oData) {
var i,
@ -210,19 +203,23 @@ var AIRTIME = (function(AIRTIME){
//putting serialized data back into the correct js type to make
//sure everything works properly.
for (i = 0, length = a.length; i < length; i++) {
a[i] = (a[i] === "true") ? true : false;
if (typeof(a[i]) === "string") {
a[i] = (a[i] === "true") ? true : false;
}
}
a = oData.ColReorder;
for (i = 0, length = a.length; i < length; i++) {
a[i] = parseInt(a[i], 10);
if (typeof(a[i]) === "string") {
a[i] = parseInt(a[i], 10);
}
}
oData.iCreate = parseInt(oData.iCreate, 10);
},
"fnServerData": AIRTIME.showbuilder.fnServerData,
"fnRowCallback": function ( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
"fnRowCallback": function fnRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
var i,
sSeparatorHTML,
fnPrepareSeparatorRow,
@ -233,7 +230,7 @@ var AIRTIME = (function(AIRTIME){
$nRow = $(nRow),
$image;
fnPrepareSeparatorRow = function(sRowContent, sClass, iNodeIndex) {
fnPrepareSeparatorRow = function fnPrepareSeparatorRow(sRowContent, sClass, iNodeIndex) {
node = nRow.children[iNodeIndex];
node.innerHTML = sRowContent;
@ -413,7 +410,7 @@ var AIRTIME = (function(AIRTIME){
//disable cancelling current show.
AIRTIME.button.disableButton("sb-button-cancel");
},
"fnDrawCallback": function(oSettings, json) {
"fnDrawCallback": function fnBuilderDrawCallback(oSettings, json) {
var wrapperDiv,
markerDiv,
$td,
@ -421,26 +418,40 @@ var AIRTIME = (function(AIRTIME){
aData,
elements,
i, length, temp,
$cursorRows;
$cursorRows,
$table = $(this),
$parent = $table.parent(),
//use this array to cache DOM heights then we can detach the table to manipulate it to increase speed.
heights = [];
clearTimeout(AIRTIME.showbuilder.timeout);
//only create the cursor arrows if the library is on the page.
if ($lib.length > 0 && $lib.filter(":visible").length > 0) {
$cursorRows = $sbTable.find("tbody tr.sb-future.sb-allowed:not(.sb-header, .sb-empty)");
$cursorRows = $sbTable.find("tbody tr:not(.sb-header, .sb-empty, .sb-now-playing, .sb-past, .sb-not-allowed)");
//need to get heights of tds while elements are still in the DOM.
for (i = 0, length = $cursorRows.length; i < length; i++) {
$td = $($cursorRows.get(i)).find("td:first");
heights.push($td.height());
}
//create cursor arrows.
$cursorRows.each(function(i, el) {
$td = $(el).find("td:first");
//detach the table to increase speed.
$table.detach();
for (i = 0, length = $cursorRows.length; i < length; i++) {
$td = $($cursorRows.get(i)).find("td:first");
if ($td.hasClass("dataTables_empty")) {
$parent.append($table);
return false;
}
wrapperDiv = $("<div />", {
"class": "innerWrapper",
"css": {
"height": $td.height()
"height": heights[i]
}
});
markerDiv = $("<div />", {
@ -448,7 +459,7 @@ var AIRTIME = (function(AIRTIME){
});
$td.append(markerDiv).wrapInner(wrapperDiv);
});
}
//if there is only 1 cursor on the page highlight it by default.
if ($cursorRows.length === 1) {
@ -457,6 +468,8 @@ var AIRTIME = (function(AIRTIME){
$cursorRows.addClass("cursor-selected-row");
}
}
$parent.append($table);
}
//order of importance of elements for setting the next timeout.

2
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
View file

@ -206,6 +206,7 @@ AIRTIME = (function(AIRTIME) {
}
});
/*
//check if the timeline viewed needs updating.
setInterval(function(){
var data = {},
@ -237,6 +238,7 @@ AIRTIME = (function(AIRTIME) {
} );
}, 5 * 1000); //need refresh in milliseconds
*/
};
mod.onResize = function() {