v1.0.11

rodber · Apr 22, 2018 · ba2ec83 · ba2ec83
1 parent b5eaccf
commit ba2ec83
Show file tree

Hide file tree

Showing 10 changed files with 1,492 additions and 82 deletions.
diff --git a/app/app.php b/app/app.php
@@ -1,6 +1,6 @@
 <?php
 define('G_APP_NAME', 'Chevereto Free');
-define('G_APP_VERSION', '1.0.10');
+define('G_APP_VERSION', '1.0.11');
 define('G_APP_GITHUB_OWNER', 'Chevereto');
 define('G_APP_GITHUB_REPO', 'Chevereto-Free');
 define('G_APP_GITHUB_REPO_URL', 'https://github.com/' . G_APP_GITHUB_OWNER . '/' . G_APP_GITHUB_REPO);

diff --git a/app/lib/chevereto.js b/app/lib/chevereto.js
@@ -1924,10 +1924,10 @@ CHV.fn.bindSelectableItems = function() {
 		return;
 	}
 
-	$("html.device-nonmobile " + sel).selectable({ //
+	$("html.device-nonmobile " + sel).selectable({
+		delay: 150,
 		filter: PF.obj.listing.selectors.list_item,
 		cancel: ".content-empty, .header, #tab-share, #tab-full-info, .viewer-title, .header-link, .top-bar, .content-listing-pagination *, #fullscreen-modal, #top-user, #background-cover, .list-item-desc, .list-item-image-tools, [data-action=load-image], #tab-codes",
-		delay: 5, // Avoids unattended click reset
 		selecting: function(event, ui) {
 			var $this = $(ui.selecting);
 			var unselect = $this.hasClass("selected");
@@ -2165,12 +2165,6 @@ CHV.fn.uploader = {
 		$("[name=upload-category-id]", this.selectors.root).prop("value", "");
 		$("[name=upload-nsfw]", this.selectors.root).prop("checked", this.defaultChecked);
 
-		/*
-		$(this.selectors.close_cancel, this.selectors.root).hide().each(function() {
-			if($(this).data("action") == "close-upload") $(this).show();
-		});
-		*/
-
 		this.boxSizer(true);
 	},
 
@@ -2211,7 +2205,7 @@ CHV.fn.uploader = {
 
 		if(!$("body").is("#upload") && $(this.selectors.root).height() > $(window).height()) {
 			$(this.selectors.root).height($(window).height()).css({"overflow-y": "scroll", "overflow-x": "auto"});
-            $("body").addClass("overflow-hidden");
+      $("body").addClass("overflow-hidden");
 		} else {
 			$(this.selectors.root).css("overflow-y", "");
 			$("body").removeClass("overflow-hidden");
@@ -2404,12 +2398,6 @@ CHV.fn.uploader = {
 
 		$(this.selectors.queue + " " + this.selectors.queue_item + ":not([data-id])", this.selectors.root).hide(); // hide the stock items
 
-		/*
-		$(this.selectors.close_cancel, this.selectors.root).hide().each(function() {
-			if($(this).data("action") == "close-upload") $(this).show();
-		});
-		*/
-
 		var failed_before = failed_files,
 			failed_files = [],
 			j = 0,
@@ -2624,11 +2612,7 @@ CHV.fn.uploader = {
 			}
 			return;
 		}
-		/*
-		$(this.selectors.close_cancel, this.selectors.root).hide().each(function() {
-			if($(this).data("action") == "cancel-upload") $(this).show();
-		});
-		*/
+
 		this.uploadThreads += 1;
 
 		if(this.uploadThreads < CHV.obj.config.upload.threads && nextId) {
@@ -2772,13 +2756,6 @@ CHV.fn.uploader = {
 				if(self.uploadThreads < CHV.obj.config.upload.threads && nextId) {
 					CHV.fn.uploader.upload($queue_item.next());
 					$(CHV.fn.uploader.selectors.root).addClass('queueHasResults');
-					/*
-					$(CHV.fn.uploader.selectors.close_cancel, CHV.fn.uploader.selectors.root).hide().each(function() {
-						if($(this).data("action") == "cancel-upload-remaining") {
-							$(this).show();
-						}
-					});
-					*/
 				}
 
 				if(self.uploadProcessedIds.length == Object.size(self.files)) {
@@ -4233,10 +4210,6 @@ CHV.fn.list_editor = {
 
 		if(/image/.test(dealing_with)) {
 
-			/*if( (response.request.editing && response.request.editing.new_album == "true") || (response.request.album && response.request.album.new == "true")) {
-				//CHV.fn.list_editor.updateUserCounters("album", 1);
-			}*/
-
 			if(dealing_with == "image") { // single
 				CHV.fn.list_editor.updateItem("[data-id="+$targets.data("id")+"]", response.image, "move");
 			} else {

diff --git a/app/lib/chevereto.min.js b/app/lib/chevereto.min.js
diff --git a/app/themes/Peafowl/style.css b/app/themes/Peafowl/style.css
@@ -3,7 +3,7 @@ Theme Name: Peafowl
 Theme URL: http://chevereto.com/
 Version: 3
 Author: Rodolfo Berrios
-@Chevereto: 3.10.3
+@Chevereto: 3.10.6
 @requires peafowl.css
 */
 
@@ -57,7 +57,6 @@ body.split {
 	/*max-width: 1620px;*/
 }
 
-
 @media (min-width: 992px) {
 	.content-width.wide {
 		max-width: none;
@@ -126,7 +125,6 @@ body#upload {
 			background-color: #AAA;
 			background-color: rgba(0,0,0,.3);
 		}
-
 	#image-viewer-loading {
 		width: 30px;
 		height: 30px;
@@ -649,7 +647,7 @@ body:not(#upload) [data-action="reset-upload"] {
 
 .list-item-image-tools {
 	position: absolute;
-	right: -2.4em;
+	right: 0;
 	top: 0;
 	opacity: 0;
 }

diff --git a/app/themes/Peafowl/style.min.css b/app/themes/Peafowl/style.min.css