Merge branch 'feature/music'

changelog.txt

@@ -1,6 +1,7 @@
 [B]WIMM Change log[/B]
 
 4.1.12
+ - Massive clean up of the music section
 
 4.1.11
  - Add support for tags to TV shows

resources/js/app/common/util.js

@@ -38,12 +38,16 @@ XWMM.util.toTitleCase = function(str) {
  * @param {array} value The array to convert.
  * @return {string} The list.
  */
-XWMM.util.convertArrayToList = function(value) {
+XWMM.util.convertArrayToList = function(value, delim) {
     if (value === undefined || value.length === 0) {
         return '';
     }
     else {
-        return value.join(' / ');
+        if (delim === undefined) {
+            delim = ' / ';
+        }
+
+        return value.join(delim);
     }
 };
 

resources/js/app/music/albumgenres.js

@@ -20,57 +20,4 @@
  * along with WIMM.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var AlbumcolModel = new Ext.grid.ColumnModel([
-        {header: '#', dataIndex: 'albumid', hidden: true},
-        {header: 'Album', dataIndex: 'strAlbum', width: 150},
-        {header: 'Artist', dataIndex: 'strArtist', hidden: true},
-        {header: 'Genre', dataIndex: 'strGenre', hidden: true},
-        {header: 'Year', dataIndex: 'iYear', hidden: true}
-]);
-
-var AlbumRecord = Ext.data.Record.create([
-   {name: 'albumid'},
-   {name: 'strAlbum', mapping:'label'},
-   {name: 'strArtist', mapping:'artist'},
-   {name: 'strGenre', mapping:'genre', convert:convertGenre},
-   {name: 'year'}, {name: 'currentThumbnail', mapping:'thumbnail'}
-]);
-
-var AlbumStore = new Ext.data.GroupingStore({
-    sortInfo: {field: 'strAlbum', direction: 'ASC'},
-    autoLoad: true,
-    groupField: 'strGenre',
-    proxy: new Ext.data.XBMCProxy({
-        jsonData : {'jsonrpc': '2.0', 'method': 'AudioLibrary.GetAlbums', 'params': {'properties': ['genre', 'artist', 'year', 'thumbnail']},'id': 1}
-    }),
-    reader: new Ext.data.JsonReader({
-        root:'result.albums'
-        }, AlbumRecord)
-});
-
-function convertGenre(v, record) {
-    return v.join(',');
-}
-
-AlbumGrid = new Ext.grid.GridPanel({
-    cm: AlbumcolModel,
-    id: 'albumGrid',
-    enableDragDrop: false,
-    stripeRows: true,
-    viewconfig: {forceFit: true},
-    view: new Ext.grid.GroupingView({
-        forceFit:true,
-        width: 260,
-        startCollapsed: true,
-        showGroupName  : false,
-        // enableGrouping: false,
-        enableGroupingMenu : true,
-        //enableNoGroups: false,
-        groupTextTpl: '{text} '}),
-    selModel: new Ext.grid.RowSelectionModel({singleSelect: true}),
-    region: 'west',
-    width: 260,
-    split: true,
-    store: AlbumStore
-
-});
+Ext.getCmp('albumGrid').getStore().groupBy('genre');