Merge pull request #49 from eriksjaastad/mixed-content-error

Mixed content error
eriksjaastad · Aug 14, 2015 · 8deaa79 · 8deaa79
2 parents 797f3c1 + e8307d3
commit 8deaa79
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/app/index.html b/app/index.html
@@ -32,7 +32,7 @@ <h2>Visual Data Surrounding You</h2>
     </main>
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
   <script src="https://maps.googleapis.com/maps/api/js?v=3.exp"></script>
-  <script src="markerclusterer.min.js"></script>
+  <script src="markerclusterer.js"></script>
   <script src="jquery.ui.map.js"></script>
   <script src="js/bundle.js"></script>
   </body>

diff --git a/public/index.html b/public/index.html
@@ -32,7 +32,7 @@ <h2>Visual Data Surrounding You</h2>
     </main>
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
   <script src="https://maps.googleapis.com/maps/api/js?v=3.exp"></script>
-  <script src="markerclusterer.min.js"></script>
+  <script src="markerclusterer.js"></script>
   <script src="jquery.ui.map.js"></script>
   <script src="js/bundle.js"></script>
   </body>

diff --git a/public/js/bundle.js b/public/js/bundle.js
@@ -29580,7 +29580,7 @@
 	      //construct new tweet date
 	      var tweetDate = document.createElement('p');
 	      tweetDate.setAttribute('class', 'icon-twitter');
-	      tweetDate.textContent = ' on ' + formatMonth(curTime.getMonth()) + formatDay(curTime.getDay()) + ', ' + curTime.getFullYear() + ' at ' + formatTime(curTime.getHours(), curTime.getMinutes());
+	      tweetDate.textContent = ' on ' + formatMonth(curTime.getMonth()) + formatDay(curTime.getDate()) + ', ' + curTime.getFullYear() + ' at ' + formatTime(curTime.getHours(), curTime.getMinutes());
 
 	      //build & append tweet
 	      newListContent.appendChild(tweetText);
@@ -29619,9 +29619,9 @@
 	  }
 	}
 
-	function formatDay(day) {
-	  day = day < 10 ? '0' + day : day;
-	  return day;
+	function formatDay(date) {
+	  date = date < 10 ? '0' + date : date;
+	  return date;
 	}
 
 	function formatTime(currentHour, currentMinute) {

diff --git a/public/markerclusterer.js b/public/markerclusterer.js
@@ -187,10 +187,12 @@ function MarkerClusterer(map, opt_markers, opt_options) {
  * @private
  */
 MarkerClusterer.prototype.MARKER_CLUSTER_IMAGE_PATH_ =
-    'http://google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/' +
+    '//google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/' +
     'images/m';
 
 
+
+
 /**
  * The marker cluster image path.
  *