Merge branch 'gh-pages' of github.com:breunigs/ingress-intel-total-conversion into gh-pages

Conflicts:
	code/hooks.js

code/hooks.js

@@ -23,13 +23,15 @@
 //              code/map_data.js#renderPortal near the end. Will hand
 //              the Leaflet CircleMarker for the portal in "portal" var.
 // portalDetailsUpdated: fired after the details in the sidebar have
-//              been (re-)rendered
+//              been (re-)rendered Provides data about the portal that
+//              has been selected.
 // publicChatDataAvailable: this hook runs after data for any of the
 //              public chats has been received and processed, but not
 //              yet been displayed. The data hash contains both the un-
 //              processed raw ajax response as well as the processed
 //              chat data that is going to be used for display.
 
+
 window._hooks = {}
 window.VALID_HOOKS = ['portalAdded', 'portalDetailsUpdated',
   'publicChatDataAvailable'];

code/portal_detail_display.js

@@ -1,4 +1,3 @@
-
 // PORTAL DETAILS MAIN ///////////////////////////////////////////////
 // main code block that renders the portal details in the sidebar and
 // methods that highlight the portal in the map view.
@@ -71,7 +70,7 @@ window.renderPortalDetails = function(guid) {
   // weren’t available yet.
   resolvePlayerNames();
 
-  runHooks('portalDetailsUpdated', {});
+  runHooks('portalDetailsUpdated', {portalDetails: d});
 }
 
 // draws link-range and hack-range circles around the portal with the