a1d48bbd30
see: https://docs.google.com/document/d/1XXMvReO8-Awi1EZXAXS4PzDzdNvV6pGcuaF4Q9821Es/pub The files are now grouped by view / component. Tests are located beside tested js files. The Grunt build will be responsible for only distributing actual files without the tests. Each partial is at the same level as the js files related to it. Ideally css files should be at the same level, maybe I'll refactor this later. Moves all non-bower plugins to app/vendor. Moves all images to app/images and styles to app/styles. Merges the test and non-test jshintrc files. Adds all the Jamstash contributors to the package.json file while I was refactoring. Conflicts: app/app.js app/images/vgrabber.gif app/images/vgrabber2-active.gif app/images/vgrabber2-normal.gif app/index.html
11 lines
357 B
JavaScript
11 lines
357 B
JavaScript
'use strict';
|
|
|
|
var jamstash = angular.module('JamStash');
|
|
|
|
jamstash.controller('QueueCtrl',
|
|
function QueueCtrl($scope, $rootScope, $routeParams, $location, utils, globals, json, notifications) {
|
|
$scope.settings = globals.settings;
|
|
$scope.song = $rootScope.queue;
|
|
//angular.copy($rootScope.queue, $scope.song);
|
|
$scope.itemType = 'pl';
|
|
});
|