Merge branch 'saas-dev' into soundcloud

Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js

airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js

@@ -198,7 +198,7 @@ function buildplaylist(p_url, p_playIndex) {
         	width = 490;
         }
         
-        window.resizeTo(width, height);    
+        window.resizeTo(width, height);
     });
 }
 
@@ -247,6 +247,4 @@ function playOne(uri, mime) {
         _playlist_jplayer.setPlaylist(playlist);
         _playlist_jplayer.play(0);
     }
-    
-    window.resizeTo(490, 167);
 }

airtime_mvc/public/js/airtime/common/common.js

@@ -143,7 +143,8 @@ function open_show_preview(p_showID, p_showIndex) {
 }
 
 function openPreviewWindow(url) {
-    _preview_window = window.open(url, $.i18n._('Audio Player'), 'width=450,height=100,scrollbars=yes');
+    // Hardcoding this here is kinda gross, but the alternatives aren't much better...
+    _preview_window = window.open(url, $.i18n._('Audio Player'), 'width=482,height=110,scrollbars=yes');
     return false;
 }
 
@@ -155,4 +156,4 @@ function removeSuccessMsg() {
     var $status = $('.success');
     
     $status.fadeOut("slow", function(){$status.empty()});
-}
+}

airtime_mvc/public/js/airtime/library/library.js

@@ -6,7 +6,9 @@ var AIRTIME = (function(AIRTIME) {
         $libTable,
         LIB_SELECTED_CLASS = "lib-selected",
         chosenItems = {},
-        visibleChosenItems = {};
+        visibleChosenItems = {},
+        $previouslySelected;
+
 
     // we need to know whether the criteria value is string or
     // numeric in order to provide a single textbox or range textboxes
@@ -859,28 +861,35 @@ var AIRTIME = (function(AIRTIME) {
             });
         
         $libTable.find("tbody").on("click", "input[type=checkbox]", function(ev) {
-            
+
             var $cb = $(this),
-                $prev,
                 $tr = $cb.parents("tr"),
-                $trs;
-            
+                // Get the ID of the selected row
+                $rowId = $tr.attr("id");
+
             if ($cb.is(":checked")) {
-                
-                if (ev.shiftKey) {
-                    $prev = $libTable.find("tbody").find("tr."+LIB_SELECTED_CLASS).eq(-1);
-                    $trs = $prev.nextUntil($tr);
-                    
-                    $trs.each(function(i, el){
-                        mod.selectItem($(el));
-                    });
+                if (ev.shiftKey && $previouslySelected !== undefined) {
+                    // If the selected row comes before the previously selected row,
+                    // we want to select previous rows, otherwise we select next
+                    if ($previouslySelected.prevAll("#"+$rowId).length !== 0) {
+                        $previouslySelected.prevUntil($tr).each(function(i, el){
+                            mod.selectItem($(el));
+                        });
+                    } else {
+                        $previouslySelected.nextUntil($tr).each(function(i, el){
+                            mod.selectItem($(el));
+                        });
+                    }
                 }
 
                 mod.selectItem($tr);
+                // Remember this row so we can properly multiselect
+                $previouslySelected = $tr;
             }
             else {
-                mod.deselectItem($tr);  
+                mod.deselectItem($tr);
             }
+            
         });
        
         // begin context menu initialization.

airtime_mvc/public/js/airtime/preferences/preferences.js

@@ -113,25 +113,6 @@ function setMsAuthenticationFieldsReadonly(ele) {
     }
 }
 
-function setCollapsibleWidgetJsCode() {
-    var x = function() {
-        var val = $('input:radio[name=thirdPartyApi]:checked').val();
-        if (val == "1") {
-            //show js textarea
-            $('#widgetCode-label').show("fast");
-            $('#widgetCode-element').show("fast");
-        } else {
-            if ($('#widgetCode-label').is(":visible")) {
-                //hide js textarea
-                $('#widgetCode-label').hide();
-                $('#widgetCode-element').hide();
-            }
-        }
-    }
-    x();
-    $('#thirdPartyApi-element input').click(x);
-}
-
 function removeLogo() {
     $.post(baseUrl+'Preference/remove-logo', function(json){});
     location.reload();
@@ -151,7 +132,7 @@ $(document).ready(function() {
         $(this).next().toggle('fast');
         $(this).toggleClass("closed");
         return false;
-    }).next().hide();
+    });
 
     if ($("#tunein-settings").find(".errors").length > 0) {
         $(".collapsible-content#tunein-settings").show();
@@ -178,7 +159,6 @@ $(document).ready(function() {
     setSystemFromEmailReadonly();
     setConfigureMailServerListener();
     setEnableSystemEmailsListener();
-    setCollapsibleWidgetJsCode();
     setTuneInSettingsReadonly();
     setTuneInSettingsListener();
     setSoundCloudSettingsListener();