-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
modified: Gemfile modified: Gemfile.lock modified: app/assets/stylesheets/application.css modified: app/assets/javascripts/application.js -- added jquery-ui gem modified: app/assets/javascripts/angular/controllers/listen.js modified: app/assets/javascripts/angular/controllers/projects.js new file: app/assets/javascripts/angular/controllers/search.js modified: app/assets/javascripts/angular/directives/directives.js modified: app/assets/javascripts/angular/services/services.js modified: app/assets/javascripts/app.js -- general front end work. $rootScope refresh method added. Services refactored into services.js modified: app/assets/javascripts/controllers.js.erb -- removed parts of the file that aren't necessary. this file is kept only as an example modified: app/assets/javascripts/functions.js -- fixed bug, adding to global protoype caused error in other libraries. deleted: app/assets/javascripts/jasmine_examples/Player.js deleted: app/assets/javascripts/jasmine_examples/Song.js -- not used, removed deleted: app/assets/javascripts/bookmarks.js.coffee deleted: app/assets/javascripts/progresses.js.coffee deleted: app/assets/javascripts/saved_searches.js.coffee -- default scaffold stuff not used modified: app/assets/templates/home.html modified: app/assets/templates/listen.html new file: app/assets/templates/search_details.html new file: app/assets/templates/searches_index.html modified: app/views/layouts/application.html.erb -- added reload route link for quick refresh modified: config/routes.rb -- cleaned up / commented deleted: vendor/assets/javascripts/jQuery.jPlayer.2.2.0/Jplayer.swf deleted: vendor/assets/javascripts/jQuery.jPlayer.2.2.0/add-on/jplayer.playlist.min.js deleted: vendor/assets/javascripts/jQuery.jPlayer.2.2.0/add-on/jquery.jplayer.inspector.js deleted: vendor/assets/javascripts/jQuery.jPlayer.2.2.0/jquery.jplayer.min.js deleted: vendor/assets/javascripts/jQuery.jPlayer.2.2.0/popcorn/popcorn.jplayer.js -- removed jplayer - bot being used new file: vendor/assets/javascripts/select2-release-3.2/LICENSE new file: vendor/assets/javascripts/select2-release-3.2/README.md new file: vendor/assets/javascripts/select2-release-3.2/release.sh new file: vendor/assets/javascripts/select2-release-3.2/select2.css new file: vendor/assets/javascripts/select2-release-3.2/select2.js new file: vendor/assets/javascripts/select2-release-3.2/select2.min new file: vendor/assets/javascripts/select2-release-3.2/select2.png new file: vendor/assets/javascripts/select2-release-3.2/select2x2.png new file: vendor/assets/javascripts/select2-release-3.2/spinner.gif modified: app/assets/javascripts/application.js -- added select2 library
- Loading branch information
Showing
34 changed files
with
3,511 additions
and
1,176 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| "use strict"; | ||
|
|
||
| function SearchesCtrl($scope, $resource, Search) { | ||
| // $scope.sitesResource = $resource('/sites', {}, { get: { method:'GET', params:{}, isArray: true }}); | ||
| // $scope.sites = $scope.sitesResource.get(); | ||
| } | ||
|
|
||
| SearchesCtrl.$inject = ['$scope', '$resource']; | ||
|
|
||
|
|
||
| function SearchCtrl($scope, $resource, Search) { | ||
| // $scope.sitesResource = $resource('/sites', {}, { get: { method:'GET', params:{}, isArray: true }}); | ||
| // $scope.sites = $scope.sitesResource.get(); | ||
|
|
||
| $scope.projects = [ {name: "demo", id: 6}, {name: "dddemo", id: 7}, {name: "ddaademo", id: 1}, {name: "desssdmo", id: 12}]; | ||
| $scope.selectedProjects = [$scope.projects[0].id]; | ||
|
|
||
| $scope.sites = [ {name: "fffff", id: 425}, {name: "ddddd", id: 587}, {name: "ssss", id: 374}, {name: "aaaaa", id: 175}]; | ||
| $scope.selectedSites= [$scope.sites[0].id]; | ||
|
|
||
| // $scope.tags = ... | ||
| $scope.selectedTags =[]; | ||
|
|
||
| $scope.jobAnnotations = "Include"; | ||
| $scope.referenceAnnotations = "Include"; | ||
|
|
||
| $scope.startDate = undefined; | ||
| $scope.endDate = undefined; | ||
|
|
||
| // $scope.tags = ... | ||
| // $scope.audioRecordings = ... | ||
| $scope.selectedAudioRecordings =[]; | ||
|
|
||
|
|
||
| } | ||
|
|
||
| SearchCtrl.$inject = ['$scope', '$resource']; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,51 +1,40 @@ | ||
| /* http://docs.angularjs.org/#!angular.service */ | ||
|
|
||
| //angular.service('Photographers', function($resource) { | ||
| // return $resource('photographers/:photographer_id', {}, | ||
| // { 'index': { method: 'GET', isArray: true }}); | ||
| //}); | ||
| // | ||
| //angular.service('Galleries', function($resource) { | ||
| // return $resource('photographers/:photographer_id/galleries/:gallery_id', {}, | ||
| // { 'index': { method: 'GET', isArray: true }}); | ||
| //}); | ||
| // | ||
| //angular.service('Photos', function($resource) { | ||
| // return $resource('photographers/:photographer_id/galleries/:gallery_id/photos', {}, | ||
| // { 'index': { method: 'GET', isArray: true }}); | ||
| //}); | ||
| // | ||
| //angular.service('SelectedPhotos', function($resource) { | ||
| // return $resource('selected_photos/:selected_photo_id', {}, | ||
| // { 'create': { method: 'POST' }, | ||
| // 'index': { method: 'GET', isArray: true }, | ||
| // 'update': { method: 'PUT' }, | ||
| // 'destroy': { method: 'DELETE' }}); | ||
| //}); | ||
|
|
||
|
|
||
| (function() { | ||
| /** | ||
| * Helper method for adding a put request onto the standard angular resource service | ||
| * @param $resource - the stub resource | ||
| * @param {string} path - the webserver path | ||
| * @param {Object} paramDefaults | ||
| * @param {Object} [actions] a set of actions to also add (extend) | ||
| * @return {*} | ||
| */ | ||
| function resourcePut($resource, path, paramDefaults, actions) { | ||
| var a = actions || {}; | ||
| a.update = {method: 'PUT'}; | ||
| a.update = a.update || {method: 'PUT'}; | ||
| return $resource(path, paramDefaults, a); | ||
| } | ||
|
|
||
| var bawss = angular.module("baw.services", ['ngResource']); | ||
|
|
||
| //function addPut | ||
|
|
||
| /** | ||
| * | ||
| */ | ||
| bawss.factory('Project', function($resource) { | ||
| return resourcePut($resource, '/projects/:projectId', {projectId: "@projectId"}); | ||
| }); | ||
|
|
||
| // var projectResource = $resource('/projects/:projectId', {projectId: '@id'}, { | ||
| // get: { method:'GET', params:{projectId: '@id'}, isArray: false } | ||
| // }); | ||
| // | ||
| // baws.factory('projects', function(){ | ||
| // var projectsService; | ||
| // | ||
| // return projectsService; | ||
| // }); | ||
| bawss.factory('AudioRecording', function($resource) { | ||
| return resourcePut($resource, '/audio_recordings/:recordingId', {recordingId: '@recordingId'}); | ||
| }); | ||
|
|
||
| bawss.factory('AudioEvent', function($resource) { | ||
| var actions = { | ||
| query: { method:'GET', isArray: true } | ||
| }; | ||
| return resourcePut($resource, '/audio_events', actions); | ||
| }); | ||
|
|
||
|
|
||
| })(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.