Admin: Image move & resize: Refactor for future RAW support; Lint; Up…

…grade jQuery UI
danactive · Dec 21, 2014 · 7f519d2 · 7f519d2
1 parent dd3ae1a
commit 7f519d2
Show file tree

Hide file tree

Showing 48 changed files with 16,907 additions and 1,142 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,4 @@ gallery-dan
 todo
 node_modules
 npm-debug.log
-resizeImages
-!node_modules/expect.js/index.js
+resizeImages
diff --git a/admin/get_gallery_directories.js b/admin/get_gallery_directories.js
@@ -4,7 +4,6 @@ var fs = require('fs');
 
 exports.init = function (param) {
 	var response = param.response,
-		request = param.request,
 		files = fs.readdirSync('.'),
 		i,
 		len = files.length,

diff --git a/app.js b/app.js
@@ -1,13 +1,8 @@
 /*global __dirname, console, require*/
-var doT = require('doT'),
+var adminImageManipulation = require('./js/admin-image-manipulation.js'),
 	express = require('express'),
 	app = express(),
 	expressPort = 80,
-	constant = {
-		"debug": false,
-		"resizeFolder": "resizeImages",
-		"tempThumbFolder": '_historyThumb'
-	},
 	path = require('path'),
 	serveStaticPages = function (param) {
 		var request = param.request,
@@ -90,18 +85,18 @@ app.get(/(admin\/walk-path)/, function(request, response) {
 				'/js/global.js',
 				'/js/walk-path-tested.js',
 				'/js/directory-contents.js',
-				'/lib/jquery-ui-1.10.3.datepicker.sortable/jquery-ui-1.10.3.custom.min.js',
+				'/lib/jquery-ui-1.11.2.custom/jquery-ui.min.js',
 				'/public/views.js'
 			],
 			"css": [
-				'/lib/jquery-ui-1.10.3.datepicker.sortable/humanity/jquery-ui-1.10.3.custom.min.css',
+				'/lib/jquery-ui-1.11.2.custom/jquery-ui.min.css',
 				'/css/directory-contents.css'
 			]
 		}
 	);
 });
 app.get(/(api\/walk-path)/, function(request, response) {
-	require('./js/admin-directory-contents-api.js').list({"constant": constant, "request": request, "response": response});
+	require('./js/admin-directory-contents-api.js').list({"request": request, "response": response});
 });
 app.get(/(admin\/diff-album-path)/, function(request, response) {
 	response.render(
@@ -120,13 +115,16 @@ app.get(/(admin\/diff-album-path)/, function(request, response) {
 	);
 });
 app.post(/(admin\/preview-generator)/, function(request, response) {
-	require('./js/admin-image-manipulation.js').preview({"constant": constant, "request": request, "response": response});
+	adminImageManipulation.preview({"request": request, "response": response});
 });
 app.post(/(admin\/rename-photos)/, function(request, response) {
-	require('./js/admin-image-manipulation.js').rename({"constant": constant, "request": request, "response": response});
+	adminImageManipulation.rename({"request": request, "response": response});
 });
 app.post(/(admin\/resize-photo)/, function(request, response) {
-	require('./js/admin-image-manipulation.js').resize({"constant": constant, "request": request, "response": response});
+	adminImageManipulation.resize({"request": request, "response": response});
+});
+app.post(/(admin\/delete-path)/, function(request, response) {
+	adminImageManipulation.deletePath({"request": request, "response": response});
 });
 
 app.get('*', function(request, response) {

diff --git a/gruntfile.js b/gruntfile.js
@@ -31,14 +31,19 @@ module.exports = function (grunt) {
 		},
 		jshint: {
 			options: {
-				curly: true,
-				eqnull: true,
-				immed: true,
-				latedef: true,
-				loopfunc: true,
-				noarg: true,
-				sub: true,
-				undef: true
+				"curly": true,
+				"debug": false,
+				"eqeqeq": true,
+				"globals": {
+					"browser": true
+				},
+				"immed": true,
+				"latedef": true,
+				"loopfunc": true,
+				"noarg": true,
+				"sub": true,
+				"undef": true,
+				"unused": true
 			},
 			adminJs: ['gruntfile.js', 'package.json', 'app.js', 'admin/*.js', 'test/*.js', 'lib/json_to_xml.js'],
 			viewJs: ['js/*.js', '!js/edit_admin_xml.js', '!<%= jshint.viewJsDebug.files.src %>'],

diff --git a/js/admin-directory-contents-api.js b/js/admin-directory-contents-api.js
@@ -59,8 +59,6 @@ Format directory contents: files or folders as JSON
 function generateJson(arg) {
 	var currentFolder,
 		filenames,
-		isFolder,
-		isRasterFile,
 		jsonPackage = { "items": [] },
 		len,
 		path = require('path');
@@ -98,6 +96,8 @@ function generateJson(arg) {
 	function getType (extension) {
 		if (extension.toLowerCase().match(/\.(gif|jpg|jpeg|png)$/)) {
 			return "image";
+		} else if (extension.toLowerCase().match(/\.(arw|raw|psd)$/)) {
+			return "source";
 		} else if (extension.toLowerCase().match(/\.(avi|mov|mp4|mts|qt|webm)$/)) {
 			return "video";
 		} else if (extension === "") {

diff --git a/js/admin-edit-xml-tested.js b/js/admin-edit-xml-tested.js
@@ -1,4 +1,5 @@
 /*global $, album, util*/
+/*exported SaveToJson*/
 var schema = {
 	"filename": "filename",
 	"city": "photo_city",