Merge branch 'develop' into feature/subalbums

# Conflicts:
#	src/package.json
#	src/scripts/lychee.js

docs/Changelog.md

@@ -1,3 +1,10 @@
+## v3.1.5
+
+Released October 25, 2016
+
+- `New` Hide mouse pointer in full screen mode (#620)
+- `Improved` Smoothing rotation of album (#626)
+
 ## v3.1.4
 
 Released August 28, 2016

src/package.json

@@ -14,20 +14,20 @@
     "compile": "gulp"
   },
   "dependencies": {
-    "babel-preset-es2015": "^6.13.2",
+    "babel-preset-es2015": "^6.18.0",
     "basiccontext": "^3.5.1",
     "basicmodal": "^3.3.7",
     "gulp": "^3.9.1",
-    "gulp-autoprefixer": "3.1.0",
+    "gulp-autoprefixer": "3.1.1",
     "gulp-babel": "^6.1.2",
     "gulp-concat": "^2.6.0",
     "gulp-inject": "^4.1.0",
-    "gulp-load-plugins": "^1.2.4",
+    "gulp-load-plugins": "^1.3.0",
     "gulp-minify-css": "^1.2.4",
     "gulp-rimraf": "^0.2.0",
     "gulp-sass": "^2.3.2",
     "gulp-uglify": "^2.0.0",
-    "jquery": "^3.1.0",
+    "jquery": "^3.1.1",
     "mousetrap": "^1.6.0"
   }
 }

src/scripts/album.js

@@ -1,6 +1,5 @@
 /**
  * @description Takes care of every action an album can handle and execute.
- * @copyright   2015 by Tobias Reich
  */
 
 const buildAlbumOptions = function(albums, select, parent = 0, layer = 0) {

src/scripts/albums.js

@@ -1,6 +1,5 @@
 /**
  * @description Takes care of every action albums can handle and execute.
- * @copyright   2015 by Tobias Reich
  */
 
 albums = {

src/scripts/api.js

@@ -1,6 +1,5 @@
 /**
  * @description This module communicates with Lychee's API
- * @copyright   2015 by Tobias Reich
  */
 
 api = {

src/scripts/build.js

@@ -1,6 +1,5 @@
 /**
  * @description This module is used to generate HTML-Code.
- * @copyright   2015 by Tobias Reich
  */
 
 build = {}

src/scripts/contextMenu.js

@@ -1,6 +1,5 @@
 /**
  * @description This module is used for the context menu.
- * @copyright   2015 by Tobias Reich
  */
 
 const buildAlbumList = function(albums, exclude, action, parent = 0, layer = 0) {

src/scripts/header.js

@@ -1,6 +1,5 @@
 /**
  * @description This module takes care of the header.
- * @copyright   2015 by Tobias Reich
  */
 
 header = {

src/scripts/init.js

@@ -1,6 +1,5 @@
 /**
  * @description This module is used for bindings.
- * @copyright   2015 by Tobias Reich
  */
 
 $(document).ready(function() {

src/scripts/loadingBar.js

@@ -1,6 +1,5 @@
 /**
  * @description This module is used to show and hide the loading bar.
- * @copyright   2015 by Tobias Reich
  */
 
 loadingBar = {

src/scripts/lychee.js

@@ -1,6 +1,5 @@
 /**
  * @description This module provides the basic functions of Lychee.
- * @copyright   2015 by Tobias Reich
  */
 
 lychee = {

src/scripts/multiselect.js

@@ -1,6 +1,5 @@
 /**
  * @description Select multiple albums or photos.
- * @copyright   2015 by Tobias Reich
  */
 
 const isSelectKeyPressed = function(e) {

src/scripts/password.js

@@ -1,6 +1,5 @@
 /**
  * @description Controls the access to password-protected albums and photos.
- * @copyright   2015 by Tobias Reich
  */
 
 password = {

src/scripts/photo.js

@@ -1,6 +1,5 @@
 /**
  * @description Takes care of every action a photo can handle and execute.
- * @copyright   2015 by Tobias Reich
  */
 
 photo = {

src/scripts/search.js

@@ -1,6 +1,5 @@
 /**
  * @description Searches through your photos and albums.
- * @copyright   2015 by Tobias Reich
  */
 
 search = {

src/scripts/settings.js

@@ -1,6 +1,5 @@
 /**
  * @description Lets you change settings.
- * @copyright   2015 by Tobias Reich
  */
 
 settings = {}

src/scripts/sidebar.js

@@ -1,6 +1,5 @@
 /**
  * @description This module takes care of the sidebar.
- * @copyright   2015 by Tobias Reich
  */
 
 sidebar = {

src/scripts/swipe.js

@@ -1,6 +1,5 @@
 /**
  * @description Swipes and moves an object.
- * @copyright   2015 by Tobias Reich
  */
 
 swipe = {

src/scripts/upload.js

@@ -1,6 +1,5 @@
 /**
  * @description Takes care of every action an album can handle and execute.
- * @copyright   2015 by Tobias Reich
  */
 
 upload = {}

src/scripts/view.js

@@ -1,6 +1,5 @@
 /**
  * @description Responsible to reflect data changes to the UI.
- * @copyright   2015 by Tobias Reich
  */
 
 view = {}
@@ -343,11 +342,11 @@ view.photo = {
 		$('body').css('overflow', 'hidden')
 
 		// Fullscreen
-		var timeout
+		let timeout = null
 		$(document).bind('mousemove', function() {
 			clearTimeout(timeout)
 			header.show()
-			timeout = setTimeout(header.hide, 1000)
+			timeout = setTimeout(header.hide, 2500)
 		})
 
 		lychee.animate(lychee.imageview, 'fadeIn')
@@ -365,8 +364,7 @@ view.photo = {
 		$('body').css('overflow', 'auto')
 
 		// Disable Fullscreen
-		$(document)
+		$(document).unbind('mousemove')
-			.unbind('mousemove')
 
 		// Hide Photo
 		lychee.animate(lychee.imageview, 'fadeOut')

src/scripts/view/main.js

@@ -1,6 +1,5 @@
 /**
  * @description Used to view single photos with view.php
- * @copyright   2015 by Tobias Reich
  */
 
 // Sub-implementation of lychee -------------------------------------------------------------- //

src/scripts/visible.js

@@ -1,6 +1,5 @@
 /**
  * @description This module is used to check if elements are visible or not.
- * @copyright   2015 by Tobias Reich
  */
 
 visible = {}

src/styles/_content.scss

@@ -89,6 +89,10 @@
 		&:hover img:nth-child(1),
 		&:hover img:nth-child(2) {
 			opacity: 1;
+			// Keep the composited layer created by the browser during the animation.
+			// Makes the border of the transformed thumb look better.
+			// See https://github.com/electerious/Lychee/pull/626 for more.
+			will-change: transform;
 		}
 
 		&:hover img:nth-child(1) {

src/styles/_imageview.scss

@@ -10,9 +10,14 @@
 	transition: background-color .3s;
 
 	// Modes -------------------------------------------------------------- //
-	&.view { background-color: inherit; }
+	&.view {
+		background-color: inherit;
+	}
 
-	&.full { background-color: black(1); }
+	&.full {
+		background-color: black(1);
+		cursor: none;
+	}
 
 	// ImageView -------------------------------------------------------------- //
 	#image {

src/styles/main.scss

@@ -1,7 +1,3 @@
-/**
- * @copyright   2015 by Tobias Reich
- */
-
 // Functions --------------------------------------------------------------- //
 @function black($opacity) {
 	@return rgba(0, 0, 0, $opacity);