[ticket/11103] Declare $ for jQuery, check for instance of, newlines at eof

PHPBB3-11103
This commit is contained in:
Nathan Guse 2012-10-18 19:20:54 -05:00
parent f96dac3352
commit 2c06c2bd36
4 changed files with 8 additions and 4 deletions

View file

@ -518,7 +518,7 @@ class phpbb_notification_manager
$class = $this->get_item_type_class($class_name); $class = $this->get_item_type_class($class_name);
if ($class->is_available() && method_exists($class_name, 'get_item_type')) if ($class instanceof phpbb_notification_type_interface && $class->is_available() && method_exists($class_name, 'get_item_type'))
{ {
$options = array_merge(array( $options = array_merge(array(
'id' => $class_name::get_item_type(), 'id' => $class_name::get_item_type(),
@ -556,7 +556,7 @@ class phpbb_notification_manager
$method = $this->get_method_class($class_name); $method = $this->get_method_class($class_name);
if ($method->is_available()) if ($method instanceof phpbb_notification_method_interface && $method->is_available())
{ {
$subscription_methods[] = $method_name; $subscription_methods[] = $method_name;
} }

View file

@ -736,4 +736,4 @@ p.rules a {
.notification_list ul.topiclist dt { .notification_list ul.topiclist dt {
width: 88%; width: 88%;
} }

View file

@ -15,6 +15,8 @@
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![CDATA[
<!-- IF S_NOTIFICATIONS_DISPLAY --> <!-- IF S_NOTIFICATIONS_DISPLAY -->
(function($) { // Avoid conflicts with other libraries
$(document).click(function(e) { $(document).click(function(e) {
var target = e.target; var target = e.target;
@ -22,6 +24,8 @@ $(document).click(function(e) {
$('#notification_list').hide(); $('#notification_list').hide();
} }
}); });
})(jQuery); // Avoid conflicts with other libraries
<!-- ENDIF --> <!-- ENDIF -->
// ]]> // ]]>
</script> </script>

View file

@ -1182,4 +1182,4 @@ a.imageset {
#notification_list .footer > a { #notification_list .footer > a {
display: block; display: block;
} }