Merge pull request #3 from shaunakv1/revert-2-master

Revert "update ssl"
shaunakv1 · Mar 18, 2024 · 08260f6 · 08260f6
2 parents 4b7afbf + 89b3bf5
commit 08260f6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/index.html b/index.html
@@ -6,7 +6,7 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <title>PhotoStitch</title>
 
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].1/dist/css/bootstrap.min.css" integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
+        <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootswatch/3.3.1/cosmo/bootstrap.min.css">
         <link rel="stylesheet" href="main.css">
     </head>
     <body ng-app="photoStitch">

diff --git a/main.js b/main.js
@@ -3,15 +3,16 @@ var myApp = angular.module('photoStitch',[]);
 
 myApp.controller('TilesCtrl', ['$scope', function($scope) {
 
-    $scope.tileWidth = 188;
-    $scope.tileHeight = 188;
-
-    $scope.totalWidth = 625;
-    $scope.totalHeight = 725;
-
-    $scope.step = 32;
-
-    $scope.baseUrl = "https://magnifier.flashphotography.com/Magnify.aspx?O=26529390&R=10006&F=0141&A=71994"
+   	$scope.tileWidth = 188;
+	$scope.tileHeight = 188;
+
+	$scope.totalWidth = 625;
+	$scope.totalHeight = 725;
+
+	$scope.step = 32;
+	//$scope.baseUrl = "http://images2.flashphotography.com/Magnifier/MagnifyRender.ashx?O=26529390&R=10001&F=0144&A=71994&rand=0.5268328574020416"
+	//$scope.baseUrl = "http://images2.flashphotography.com/Magnifier/Magnify.aspx?O=26529390&R=10003&F=0141&A=71994"
+    $scope.baseUrl = "http://images2.flashphotography.com/Magnifier/Magnify.aspx?O=26529390&R=10006&F=0141&A=71994"
 
     $scope.tiles = [];
 
@@ -25,7 +26,7 @@ myApp.controller('TilesCtrl', ['$scope', function($scope) {
     	    			'y': y,
     	    			top: y - ($scope.tileHeight / 2),
     	    			left: x - ($scope.tileWidth / 2),
-    	    			url: "https://magnifier.flashphotography.com/MagnifyRender.ashx?X="+x+"&Y="+y+"&O="+O+"&R="+R+"&F="+F+"&A="+A
+    	    			url: "http://images2.flashphotography.com/Magnifier/MagnifyRender.ashx?X="+x+"&Y="+y+"&O="+O+"&R="+R+"&F="+F+"&A="+A
     	    		});
     	    	}    	
     	    }
@@ -44,4 +45,4 @@ myApp.controller('TilesCtrl', ['$scope', function($scope) {
 
 function p(name,u) {
     return decodeURI((RegExp(name + '=' + '(.+?)(&|$)').exec(u) || [, null])[1]);
-}
+}