diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-02-07 12:16:47 +0100 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-02-07 12:16:47 +0100 |
| commit | 33219e2211b9a91c0436902771eb83e1e9f5964b (patch) | |
| tree | db22f1a75a49d3fd390302c7a9a57c32819f5c6c | |
| parent | d962dc1d58cfcdf294c7a304d857f0984ef6fd49 (diff) | |
fixed grunt compile errors in .4
33 files changed, 1266 insertions, 1179 deletions
diff --git a/coffee/Gruntfile.coffee b/coffee/Gruntfile.coffee index ca90ffc5f..51e03d5f5 100644 --- a/coffee/Gruntfile.coffee +++ b/coffee/Gruntfile.coffee @@ -16,7 +16,10 @@ module.exports = (grunt) -> grunt.loadNpmTasks('grunt-contrib-coffee') - grunt.loadNpmTasks('grunt-coffeelint') + grunt.loadNpmTasks('grunt-contrib-concat') + grunt.loadNpmTasks('grunt-contrib-watch') + grunt.loadNpmTasks('grunt-coffeelint') + grunt.loadNpmTasks('gruntacular'); grunt.initConfig @@ -41,10 +44,10 @@ module.exports = (grunt) -> production: '../js/' concat: - options: - banner: '<%= meta.banner %>\n' app: - src: '<%= meta.build %>main.js' + options: + banner: '<%= meta.banner %>\n' + src: '<%= meta.build %>main.js' dest: '<%= meta.production %>app.js' owncloud: src: ['lib/owncloud.coffee', 'lib/services/*.coffee'] @@ -66,21 +69,20 @@ module.exports = (grunt) -> '<%= meta.build %>owncloud.coffee' '<%= meta.build %>news.coffee' ] - coffeelintOptions: - 'no_tabs': - 'level': 'ignore' - 'indentation': - 'level': 'ignore' - - coffeelint: - app: [ - 'app.coffee' - 'services/*.coffee' - 'controllers/*.coffee' - 'directives/*.coffee' - 'filters/*.coffee' - 'lib/**/*.coffee' - ] + coffeelint: + app: [ + 'app.coffee' + 'services/*.coffee' + 'controllers/*.coffee' + 'directives/*.coffee' + 'filters/*.coffee' + 'lib/**/*.coffee' + ] + coffeelintOptions: + 'no_tabs': + 'level': 'ignore' + 'indentation': + 'level': 'ignore' watch: app: @@ -88,12 +90,13 @@ module.exports = (grunt) -> tasks: 'compile' - grunt.registerTask('run', 'watch') - grunt.registerTask('compile', [ - 'coffeelint' - 'concat:owncloud' - 'concat:news' - 'coffee' - 'concat:app' - ] - ) + grunt.registerTask('run', ['watch']) + grunt.registerTask('lint', ['coffeelint']) + grunt.registerTask('compile', [ + #'coffeelint' + 'concat:owncloud' + 'concat:news' + 'coffee' + 'concat:app' + ] + ) diff --git a/coffee/app.coffee b/coffee/app.coffee index 59f921577..91d29879f 100644 --- a/coffee/app.coffee +++ b/coffee/app.coffee @@ -34,9 +34,9 @@ $(document).ready -> # and thus clearing the scroll cache $(this).keyup (e) -> if (e.which == 116) || (e.which == 82 && e.ctrlKey) - document.location.reload(true) + document.location.reload(true) return false # click on upload button should trigger the file input $('#browselink').click -> - $('#file_upload_start').trigger('click') + $('#file_upload_start').trigger('click') diff --git a/coffee/controllers/controller.coffee b/coffee/controllers/controller.coffee index 456f60675..27ea614a2 100644 --- a/coffee/controllers/controller.coffee +++ b/coffee/controllers/controller.coffee @@ -1,10 +1,14 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### diff --git a/coffee/controllers/controllers.coffee b/coffee/controllers/controllers.coffee index 7e33962b5..606ad9ac4 100644 --- a/coffee/controllers/controllers.coffee +++ b/coffee/controllers/controllers.coffee @@ -1,10 +1,14 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### diff --git a/coffee/controllers/feedcontroller.coffee b/coffee/controllers/feedcontroller.coffee index a54f4451d..6ce5ef5c0 100644 --- a/coffee/controllers/feedcontroller.coffee +++ b/coffee/controllers/feedcontroller.coffee @@ -1,14 +1,17 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### - angular.module('News').factory '_FeedController', ['Controller', (Controller) -> class FeedController extends Controller diff --git a/coffee/controllers/itemcontroller.coffee b/coffee/controllers/itemcontroller.coffee index b3a7c9fe9..0a8b182f5 100644 --- a/coffee/controllers/itemcontroller.coffee +++ b/coffee/controllers/itemcontroller.coffee @@ -1,10 +1,14 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### diff --git a/coffee/controllers/settingscontroller.coffee b/coffee/controllers/settingscontroller.coffee index ba72bb718..38036f89f 100644 --- a/coffee/controllers/settingscontroller.coffee +++ b/coffee/controllers/settingscontroller.coffee @@ -1,15 +1,20 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### -angular.module('News').factory '_SettingsController', ['Controller', (Controller) -> +angular.module('News').factory '_SettingsController', ['Controller', +(Controller) -> class SettingsController extends Controller diff --git a/coffee/directives/draggable.coffee b/coffee/directives/draggable.coffee index 9ebd9d30e..dfed9fdb5 100644 --- a/coffee/directives/draggable.coffee +++ b/coffee/directives/draggable.coffee @@ -1,10 +1,14 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### diff --git a/coffee/directives/droppable.coffee b/coffee/directives/droppable.coffee index 37b29fca1..e00545d31 100644 --- a/coffee/directives/droppable.coffee +++ b/coffee/directives/droppable.coffee @@ -1,10 +1,14 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### diff --git a/coffee/directives/feednavigation.coffee b/coffee/directives/feednavigation.coffee index 58b0d6c24..2cc726922 100644 --- a/coffee/directives/feednavigation.coffee +++ b/coffee/directives/feednavigation.coffee @@ -1,10 +1,14 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### diff --git a/coffee/directives/hidesettingswhenfocuslost.coffee b/coffee/directives/hidesettingswhenfocuslost.coffee index 0d7220c4a..0a1f92fdf 100644 --- a/coffee/directives/hidesettingswhenfocuslost.coffee +++ b/coffee/directives/hidesettingswhenfocuslost.coffee @@ -1,10 +1,14 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### @@ -13,7 +17,8 @@ # This is used to signal the settings bar that the app has been focused and that # it should hide ### -angular.module('News').directive 'hideSettingsWhenFocusLost', ['$rootScope', ($rootScope) -> +angular.module('News').directive 'hideSettingsWhenFocusLost', ['$rootScope', +($rootScope) -> return (scope, elm, attr) -> $(document.body).click -> diff --git a/coffee/directives/onenter.coffee b/coffee/directives/onenter.coffee index a9b0ab95a..840c910cc 100644 --- a/coffee/directives/onenter.coffee +++ b/coffee/directives/onenter.coffee @@ -1,10 +1,14 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### diff --git a/coffee/directives/readfile.coffee b/coffee/directives/readfile.coffee index 32a113b82..d20e6606e 100644 --- a/coffee/directives/readfile.coffee +++ b/coffee/directives/readfile.coffee @@ -1,10 +1,14 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### diff --git a/coffee/directives/whenscrolled.coffee b/coffee/directives/whenscrolled.coffee index ef3215874..e4a00bec1 100644 --- a/coffee/directives/whenscrolled.coffee +++ b/coffee/directives/whenscrolled.coffee @@ -1,10 +1,14 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### diff --git a/coffee/filters/feedInFolder.coffee b/coffee/filters/feedInFolder.coffee index 24247ce62..fe2e6b0a7 100644 --- a/coffee/filters/feedInFolder.coffee +++ b/coffee/filters/feedInFolder.coffee @@ -1,10 +1,14 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### diff --git a/coffee/lib/owncloud.coffee b/coffee/lib/owncloud.coffee index 30d593536..91618a3f4 100644 --- a/coffee/lib/owncloud.coffee +++ b/coffee/lib/owncloud.coffee @@ -21,10 +21,11 @@ angular.module('OC', []).config ['$httpProvider', ($httpProvider) -> $httpProvider.defaults.post['requesttoken'] = oc_requesttoken # needed because crap PHP does not understand JSON - $httpProvider.defaults.post['Content-Type'] = - 'application/x-www-form-urlencoded' - $httpProvider.defaults.get['Content-Type'] = - 'application/x-www-form-urlencoded' + $httpProvider.defaults.post['Content-Type'] = + 'application/x-www-form-urlencoded' + + $httpProvider.defaults.get['Content-Type'] = + 'application/x-www-form-urlencoded' $httpProvider.defaults.transformRequest = (data) -> if angular.isDefined(data) return data diff --git a/coffee/package.json b/coffee/package.json index adb6417aa..6b9764ae6 100644 --- a/coffee/package.json +++ b/coffee/package.json @@ -1,27 +1,28 @@ { - "name": "owncloud-news-app", - "description": "ownCloud RSS reader app", - "version": "0.0.1", - "author": "ownCloud <owncloud@kde.org>", - "private": true, - "contributors": [ - { - "name": "Alessandro Cosentino", - "email": "cosenal@gmail.com" - }, - { - "name": "Bernhard Posselt", - "email": "nukeawhale@gmail.com" - } - ], - "devDependencies": { - "grunt": "~0.4.0rc7", - "coffee-script": "~1.4.0", - "grunt-contrib-coffee": "~0.4.0rc7", - "grunt-testacular": "~0.2.2", - "grunt-contrib-concat": "~0.1.2rc6", - "grunt-contrib-watch": "~0.2.0rc7", - "grunt-coffeelint": "0.0.4" - }, - "engine": "node >= 0.8" + "name": "owncloud-news-app", + "description": "ownCloud RSS reader app", + "version": "0.0.1", + "author": "ownCloud <owncloud@kde.org>", + "private": true, + "contributors": [ + { + "name": "Alessandro Cosentino", + "email": "cosenal@gmail.com" + }, + { + "name": "Bernhard Posselt", + "email": "nukeawhale@gmail.com" + } + ], + "devDependencies": { + "grunt": "~0.4.0rc7", + "grunt-cli": "~0.1.6", + "coffee-script": "~1.4.0", + "grunt-contrib-coffee": "~0.4.0rc7", + "grunt-contrib-concat": "~0.1.2rc6", + "grunt-contrib-watch": "~0.2.0rc7", + "grunt-coffeelint": "0.0.4", + "gruntacular": "~0.1.1" + }, + "engine": "node >= 0.8" } diff --git a/coffee/services/cache.coffee b/coffee/services/cache.coffee index 06e6ab5f3..ed727ab83 100644 --- a/coffee/services/cache.coffee +++ b/coffee/services/cache.coffee @@ -1,7 +1,9 @@ ### -# ownCloud +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # # This file is licensed under the Affero General Public License version 3 or diff --git a/coffee/services/feedmodel.coffee b/coffee/services/feedmodel.coffee index ff7f9c148..5b89394fa 100644 --- a/coffee/services/feedmodel.coffee +++ b/coffee/services/feedmodel.coffee @@ -1,7 +1,9 @@ ### -# ownCloud +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # # This file is licensed under the Affero General Public License version 3 or diff --git a/coffee/services/feedtype.coffee b/coffee/services/feedtype.coffee index 55ca0419e..d288d6303 100644 --- a/coffee/services/feedtype.coffee +++ b/coffee/services/feedtype.coffee @@ -1,7 +1,9 @@ ### -# ownCloud +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # # This file is licensed under the Affero General Public License version 3 or diff --git a/coffee/services/foldermodel.coffee b/coffee/services/foldermodel.coffee index 46f3b5cfa..16064e36d 100644 --- a/coffee/services/foldermodel.coffee +++ b/coffee/services/foldermodel.coffee @@ -1,7 +1,9 @@ ### -# ownCloud +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # # This file is licensed under the Affero General Public License version 3 or diff --git a/coffee/services/garbageregistry.coffee b/coffee/services/garbageregistry.coffee index 5d52d81ad..f1c1dc36e 100644 --- a/coffee/services/garbageregistry.coffee +++ b/coffee/services/garbageregistry.coffee @@ -1,10 +1,14 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### diff --git a/coffee/services/itemmodel.coffee b/coffee/services/itemmodel.coffee index e7b87f9ec..59812d5b5 100644 --- a/coffee/services/itemmodel.coffee +++ b/coffee/services/itemmodel.coffee @@ -1,10 +1,14 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### diff --git a/coffee/services/loading.coffee b/coffee/services/loading.coffee index 041170e76..112185377 100644 --- a/coffee/services/loading.coffee +++ b/coffee/services/loading.coffee @@ -1,10 +1,14 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### diff --git a/coffee/services/model.coffee b/coffee/services/model.coffee index 7094f8a83..56a038988 100644 --- a/coffee/services/model.coffee +++ b/coffee/services/model.coffee @@ -1,10 +1,14 @@ ### -# ownCloud - News app +# ownCloud news app # +# @author Alessandro Cosentino # @author Bernhard Posselt +# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> # Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> # -# This file is licensed under the Affero General Public License version 3 or later. +# This file is licensed under the Affero General Public License version 3 or +# later. +# # See the COPYING-README file # ### diff --git a/coffee/services/opmlparser.coffee b/coffee/services/opmlparser.coffee index 085a18ae5..8918110a2 100644 --- a/coffee/services/opmlparser.coffee +++ b/ |