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

CC-6067 - deselect when adding library items

This commit is contained in:
Duncan Sommerville 2015-08-18 12:01:23 -04:00
parent d30e32c2d3
commit 4bfb8fa0cb
6 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
airtime_mvc/application/controllers/NewPlaylistController.php
View File

@ -48,8 +48,6 @@ class NewPlaylistController extends Zend_Controller_Action
$modified = $this->_getParam('modified', null); $modified = $this->_getParam('modified', null);
if ($obj->getLastModified("U") !== $modified) { if ($obj->getLastModified("U") !== $modified) {
$this->createFullResponse($obj); $this->createFullResponse($obj);
Logging::info($obj->getLastModified("U"));
Logging::info($modified);
throw new PlaylistOutDatedException(sprintf(_("You are viewing an older version of %s"), $obj->getName())); throw new PlaylistOutDatedException(sprintf(_("You are viewing an older version of %s"), $obj->getName()));
} }
} }
@ -199,9 +197,9 @@ class NewPlaylistController extends Zend_Controller_Action
$objInfo = Application_Model_Library::getObjInfo($type); $objInfo = Application_Model_Library::getObjInfo($type);
Logging::info("editing {$type} {$id}"); Logging::info("editing {$type} {$id}");
if (!is_null($id)) { // if (!is_null($id)) {
Application_Model_Library::changePlaylist($id, $type); Application_Model_Library::changePlaylist($id, $type);
} // }
try { try {
$obj = new $objInfo['className']($id); $obj = new $objInfo['className']($id);
@ -552,8 +550,8 @@ class NewPlaylistController extends Zend_Controller_Action
$result['id'] = $bl->getId(); $result['id'] = $bl->getId();
$result["modified"] = $bl->getLastModified("U"); $result["modified"] = $bl->getLastModified("U");
} else if ($params['type'] == 'playlist') { } else if ($params['type'] == 'playlist') {
$result["modified"] = $this->view->modified;
$this->setPlaylistNameDescAction(); $this->setPlaylistNameDescAction();
$result["modified"] = $this->view->modified;
} }
$this->_helper->json->sendJson($result); $this->_helper->json->sendJson($result);

7
airtime_mvc/public/css/_showbuilder.css
View File

@ -534,12 +534,16 @@ li.ui-state-default {
.spl_sortable { .spl_sortable {
position: relative; position: relative;
min-height: 0; height: 100%;
overflow: auto; overflow: auto;
flex: 1 100%; flex: 1 100%;
margin: 4px 0; margin: 4px 0;
padding: 0; padding: 0;
display: flex;
flex-direction: column;
justify-content: center;
} }
.spl_sortable .list-item-container { .spl_sortable .list-item-container {
@ -551,7 +555,6 @@ li.ui-state-default {
color: white; color: white;
text-align: center; text-align: center;
vertical-align: middle;
font-size: 20px; font-size: 20px;
} }

14
airtime_mvc/public/css/styles.css
View File

@ -2627,13 +2627,15 @@ label span {
} }
fieldset > legend { fieldset > legend {
font-size: 16px;
line-height: 140%;
background: #333;
width: 100%; width: 100%;
margin: 0px; box-sizing: border-box;
padding: 0px;
border: 0px; background: #333;
font-size: 16px;
line-height: 1em;
border: 0;
margin: 0;
padding: 10px 0 10px 10px;
} }
fieldset.padded > legend { fieldset.padded > legend {

1
airtime_mvc/public/js/airtime/common/livechat.js
View File

@ -22,7 +22,6 @@ $(document).ready(function() {
var ifr = document.getElementById('livechat-compact-container'); var ifr = document.getElementById('livechat-compact-container');
if (ifr) { if (ifr) {
LC_API.on_chat_state_changed = function(data) { LC_API.on_chat_state_changed = function(data) {
console.log('Chat state changed to: ' + data.state);
if (data.state == 'offline') { if (data.state == 'offline') {
$('.wrapper').css('padding-bottom', 10); $('.wrapper').css('padding-bottom', 10);
} else { } else {

1
airtime_mvc/public/js/airtime/library/_spl.js
View File

@ -1250,6 +1250,7 @@ var AIRTIME = (function(AIRTIME){
} }
mod.fnAddItems = function(aItems, iAfter, sAddType) { mod.fnAddItems = function(aItems, iAfter, sAddType) {
AIRTIME.library.selectNone();
var sUrl = baseUrl+"new-playlist/add-items"; var sUrl = baseUrl+"new-playlist/add-items";
oData = {"aItems": aItems, "afterItem": iAfter, "type": sAddType}; oData = {"aItems": aItems, "afterItem": iAfter, "type": sAddType};
playlistRequest(sUrl, oData); playlistRequest(sUrl, oData);

1
airtime_mvc/public/js/airtime/showbuilder/_builder.js
View File

@ -322,6 +322,7 @@ var AIRTIME = (function(AIRTIME){
}; };
mod.fnAdd = function(aMediaIds, aSchedIds) { mod.fnAdd = function(aMediaIds, aSchedIds) {
AIRTIME.library.selectNone();
mod.disableUI(); mod.disableUI();
$.post(baseUrl+"showbuilder/schedule-add", $.post(baseUrl+"showbuilder/schedule-add",