|
|
@@ -6,6 +6,12 @@ angular.module('app').controller('WebController', ['$scope', '$timeout', functio
|
|
|
var img = $(event.target);
|
|
|
console.log(img);
|
|
|
img[0].id = "onView";
|
|
|
+ if (img[0].naturalWidth > img[0].naturalHeight) {
|
|
|
+ console.log("111111111");
|
|
|
+ angular.element(".image-view").addClass("width-Img");
|
|
|
+ } else {
|
|
|
+ angular.element(".image-view").removeClass("width-Img");
|
|
|
+ }
|
|
|
$scope.imgUrl = img[0].src;
|
|
|
$(".image-big").remove();
|
|
|
$(".image-view").append('<img class="image-big" src="' + $scope.imgUrl + '" data-dismiss="modal">');
|
|
|
@@ -90,14 +96,14 @@ angular.module('app').controller('WebController', ['$scope', '$timeout', functio
|
|
|
drawer.drawImage(img, 0, 0, canvas.width, canvas.height);
|
|
|
img.src = canvas.toDataURL("image/jpeg", quality);
|
|
|
if (imgNum == 0) {
|
|
|
- $("#imgpreview").append('<a data-toggle="modal" data-target="#viewModal" onClick="angular.element(this).scope().imgView(event)" class="thumbnail images"><img src="' + img.src + '"></a>');
|
|
|
+ $("#imgpreview").append('<a data-toggle="modal" data-target="#viewModal" class="thumbnail images"><img onClick="angular.element(this).scope().imgView(event)" src="' + img.src + '"></a>');
|
|
|
angular.element(".images").addClass("one");
|
|
|
} else if (imgNum == 1) {
|
|
|
- $("#imgpreview").append('<a data-toggle="modal" data-target="#viewModal" onClick="angular.element(this).scope().imgView(event)" class="thumbnail images"><img src="' + img.src + '"></a>');
|
|
|
+ $("#imgpreview").append('<a data-toggle="modal" data-target="#viewModal" class="thumbnail images"><img onClick="angular.element(this).scope().imgView(event)" src="' + img.src + '"></a>');
|
|
|
angular.element(".images").removeClass("one");
|
|
|
angular.element(".images").addClass("two");
|
|
|
} else if (imgNum >= 2) {
|
|
|
- $("#imgpreview").append('<a data-toggle="modal" data-target="#viewModal" onClick="angular.element(this).scope().imgView(event)" class="thumbnail images"><img src="' + img.src + '"></a>');
|
|
|
+ $("#imgpreview").append('<a data-toggle="modal" data-target="#viewModal" class="thumbnail images"><img onClick="angular.element(this).scope().imgView(event)" src="' + img.src + '"></a>');
|
|
|
angular.element(".images").removeClass("two");
|
|
|
angular.element(".images").addClass("three");
|
|
|
}
|
|
|
@@ -106,8 +112,4 @@ angular.module('app').controller('WebController', ['$scope', '$timeout', functio
|
|
|
reader.readAsDataURL(file);
|
|
|
};
|
|
|
|
|
|
- window.onpopstate = function(event) {
|
|
|
- window.location.reload();
|
|
|
- };
|
|
|
-
|
|
|
}]);
|
dgf
