warn if note is saved and window would be closed, fix #52

CHANGELOG

@@ -1,5 +1,11 @@
+owncloud-notes (1.0.0)
+* **Bugfix**: Remove flying loading icon
+* **Enhancement**: Make app ready for ownCloud 8
+* **Enhancement**: Show a spinner to signal when app is saving
+* **Enhancement**: Prevent closing the window when app is saving
+
 owncloud-notes (0.9)
-* Security: Remove markdown support because of [XSS in markdown-js library](https://github.com/evilstreak/markdown-js/pull/52)
+* **Security**: Remove markdown support because of [XSS in markdown-js library](https://github.com/evilstreak/markdown-js/pull/52)
 
 owncloud-notes (0.7)
 * Port to ownCloud internal app framework. Additional installation of the appframework app is not needed anymore

js/Gruntfile.js

@@ -31,7 +31,7 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-wrap');
 	grunt.loadNpmTasks('grunt-karma');
 	grunt.loadNpmTasks('grunt-phpunit');
-
+	grunt.loadNpmTasks('grunt-ng-annotate');
 
 	grunt.initConfig({
 
@@ -123,12 +123,19 @@ module.exports = function(grunt) {
 				browsers: ['PhantomJS'],
 				reporters: ['progress']
 			}
-		}
+		},
+
+		ngAnnotate: {
+            app: {
+                src: ['<%= meta.production %>app.js'],
+                dest: '<%= meta.production %>app.js'
+            }
+        },
 
 	});
 
 	// make tasks available under simpler commands
-	grunt.registerTask('build', ['jshint', 'concat', 'wrap:app']);
+	grunt.registerTask('build', ['jshint', 'concat', 'wrap:app', 'ngAnnotate']);
 	grunt.registerTask('default', ['build']);
 
 };

js/app/controllers/appcontroller.js

@@ -4,13 +4,12 @@
  * See the COPYING file.
  */
 
-app.controller('AppController', ['$scope', '$location', 'is',
-	function ($scope, $location, is) {
+app.controller('AppController', function ($scope, $location, is) {
 	$scope.is = is;
 
 	$scope.init = function (lastViewedNote) {
 		if(lastViewedNote !== 0) {
 			$location.path('/notes/' + lastViewedNote);
 		}
 	};
-}]);
+});

js/app/controllers/notecontroller.js

@@ -4,9 +4,8 @@
  * See the COPYING file.
  */
 
-app.controller('NoteController', ['$routeParams', '$scope', 'NotesModel',
-	'SaveQueue', 'note', 'Config',
-	function($routeParams, $scope, NotesModel, SaveQueue, note, Config) {
+app.controller('NoteController', function($routeParams, $scope, NotesModel,
+                                          SaveQueue, note, Config) {
 
 	NotesModel.updateIfExists(note);
 
@@ -33,4 +32,4 @@ app.controller('NoteController', ['$routeParams', '$scope', 'NotesModel',
 		Config.sync();
 	};
 
-}]);
+});

js/app/controllers/notescontroller.js

@@ -5,9 +5,8 @@
  */
 
 // This is available by using ng-controller="NotesController" in your HTML
-app.controller('NotesController', ['$routeParams', '$scope', '$location',
-	'Restangular', 'NotesModel',
-	function($routeParams, $scope, $location, Restangular, NotesModel) {
+app.controller('NotesController', function($routeParams, $scope, $location,
+                                           Restangular, NotesModel) {
 
 	$scope.route = $routeParams;
 	$scope.notes = NotesModel.getAll();
@@ -31,7 +30,7 @@ app.controller('NotesController', ['$routeParams', '$scope', '$location',
 		note.remove().then(function () {
 			NotesModel.remove(noteId);
 			$scope.$emit('$routeChangeError');
-		});	
+		});
 	};
 
-}]);
+});

js/app/directives/autofocus.js

@@ -4,15 +4,11 @@
  * See the COPYING file.
  */
 
-/**
- * Like ng-change only that it does not fire when you type faster than
- * 300 ms
- */
-app.directive('notesAutofocus', [function () {
+app.directive('notesAutofocus', function () {
     return {
         restrict: 'A',
         link: function (scope, element, attributes) {
             element.focus();
         }
     };
-}]);
+});

js/app/directives/issaving.js

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2013, Bernhard Posselt <[email protected]>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING file.
+ */
+
+app.directive('notesIsSaving', function ($window) {
+    return {
+        restrict: 'A',
+        scope: {
+            'notesIsSaving': '='
+        },
+        link: function (scope, element, attributes) {
+            $window.onbeforeunload = function () {
+                if (scope.notesIsSaving) {
+                    return t('notes', 'Note is currently saving. Leaving ' +
+                                      'the page will delete all changes!');
+                } else {
+                    return null;
+                }
+            };
+        }
+    };
+});

js/app/directives/timeoutchange.js

@@ -8,7 +8,7 @@
  * Like ng-change only that it does not fire when you type faster than
  * 300 ms
  */
-app.directive('notesTimeoutChange', ['$timeout', function ($timeout) {
+app.directive('notesTimeoutChange', function ($timeout) {
 	return {
 		restrict: 'A',
 		link: function (scope, element, attributes) {
@@ -24,4 +24,4 @@ app.directive('notesTimeoutChange', ['$timeout', function ($timeout) {
 			});
 		}
 	};
-}]);
+});

js/app/directives/tooltip.js

@@ -4,11 +4,11 @@
  * See the COPYING file.
  */
 
-app.directive('notesTooltip', [function () {
+app.directive('notesTooltip', function () {
 	return {
 		restrict: 'A',
 		link: function (scope, element, attributes) {
 			element.tooltip();
 		}
 	};
-}]);
+});

js/app/services/config.js

@@ -1,10 +1,10 @@
 /**
  * Copyright (c) 2013, Bernhard Posselt <[email protected]>
  * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING file. 
+ * See the COPYING file.
  */
 
-app.factory('Config', ['Restangular', function (Restangular) {
+app.factory('Config', function (Restangular) {
     var Config = function (Restangular) {
         this._markdown = false;
         this._Restangular = Restangular;
@@ -32,4 +32,4 @@ app.factory('Config', ['Restangular', function (Restangular) {
     };
 
     return new Config(Restangular);
-}]);
+});

js/app/services/savequeue.js

@@ -4,7 +4,7 @@
  * See the COPYING file.
  */
 
-app.factory('SaveQueue', ['$q', function($q) {
+app.factory('SaveQueue', function($q) {
 	var SaveQueue = function () {
 		this._queue = {};
 		this._flushLock = false;
@@ -54,4 +54,4 @@ app.factory('SaveQueue', ['$q', function($q) {
 	};
 
 	return new SaveQueue();
-}]);
+});

js/config/app.js

@@ -5,10 +5,8 @@
  */
 
 var app = angular.module('Notes', ['restangular', 'ngRoute']).
-config(['$provide', '$routeProvider', 'RestangularProvider', '$httpProvider',
-		'$windowProvider',
-	function($provide, $routeProvider, RestangularProvider, $httpProvider,
-			$windowProvider) {
+config(function($provide, $routeProvider, RestangularProvider, $httpProvider,
+                $windowProvider) {
 	// Always send the CSRF token by default
 	$httpProvider.defaults.headers.common.requesttoken = oc_requesttoken;
 
@@ -26,8 +24,8 @@ config(['$provide', '$routeProvider', 'RestangularProvider', '$httpProvider',
 			// $routeParams does not work inside resolve so use $route
 			// note is the name of the argument that will be injected into the
 			// controller
-			note: ['$route', '$q', 'is', 'Restangular',
-			function ($route, $q, is, Restangular) {
+			/* @ngInject */
+			note: function ($route, $q, is, Restangular) {
 
 				var deferred = $q.defer();
 				var noteId = $route.current.params.noteId;
@@ -42,7 +40,7 @@ config(['$provide', '$routeProvider', 'RestangularProvider', '$httpProvider',
 				});
 
 				return deferred.promise;
-			}]
+			}
 		}
 	}).otherwise({
 		redirectTo: '/'
@@ -57,8 +55,7 @@ config(['$provide', '$routeProvider', 'RestangularProvider', '$httpProvider',
 
 
 
-}]).run(['$rootScope', '$location', 'NotesModel', 'Config',
-	function ($rootScope, $location, NotesModel, Config) {
+}).run(function ($rootScope, $location, NotesModel, Config) {
 
 	// get config
 	Config.load();
@@ -81,4 +78,4 @@ config(['$provide', '$routeProvider', 'RestangularProvider', '$httpProvider',
 			$location.path('/');
 		}
 	});
-}]);
+});

js/package.json

@@ -1,31 +1,33 @@
 {
-	"name": "notes",
-	"description": "Notes app",
-	"version": "0.0.1",
-	"private": true,
-	"homepage": "https://github.com/owncloud/notes",
-	"repository": {
-		"type": "git",
-		"url": "[email protected]:owncloud/notes.git"
-	},
-	"bugs": "https://github.com/owncloud/notes/issues",
-	"dependencies": {},
-	"devDependencies": {
-		"grunt": "*",
-		"grunt-cli": "*",
-		"grunt-contrib-concat": "*",
-		"grunt-contrib-jshint": "*",
-		"grunt-contrib-watch": "*",
-		"karma": "*",
-		"grunt-karma": "*",
-		"grunt-wrap": "*",
-		"phantomjs": "*",
-		"grunt-phpunit": "*",
-		"bower": "*",
-		"karma-jasmine": "*",
-		"karma-phantomjs-launcher": "*",
-		"karma-chrome-launcher": "*",
-		"karma-firefox-launcher": "*"
-	},
-	"engine": "node >= 0.8"
-}
+  "name": "notes",
+  "description": "Notes app",
+  "version": "0.0.1",
+  "private": true,
+  "homepage": "https://github.com/owncloud/notes",
+  "repository": {
+    "type": "git",
+    "url": "[email protected]:owncloud/notes.git"
+  },
+  "bugs": "https://github.com/owncloud/notes/issues",
+  "dependencies": {
+    "grunt-ng-annotate": "^0.10.0"
+  },
+  "devDependencies": {
+    "grunt": "*",
+    "grunt-cli": "*",
+    "grunt-contrib-concat": "*",
+    "grunt-contrib-jshint": "*",
+    "grunt-contrib-watch": "*",
+    "karma": "*",
+    "grunt-karma": "*",
+    "grunt-wrap": "*",
+    "phantomjs": "*",
+    "grunt-phpunit": "*",
+    "bower": "*",
+    "karma-jasmine": "*",
+    "karma-phantomjs-launcher": "*",
+    "karma-chrome-launcher": "*",
+    "karma-firefox-launcher": "*"
+  },
+  "engine": "node >= 0.8"
+}