Changeset 1102479

Timestamp:

03/01/2015 12:30:15 PM (11 years ago)

Author:

.dan

Message:

v1.2.2

Location:

smokesignal

Files:

• tags/v1.2.2/class.smokesignal.php (modified) (3 diffs)
• trunk/class.smokesignal.php (modified) (3 diffs)

smokesignal/tags/v1.2.2/class.smokesignal.php

@@ -14 +14 @@
     public static function init() {
         if (!self::$initiated) {
-            self::init_hooks();
+            self::init_hooks();
             self::enqueue();
         }
@@ -39 +39 @@
         add_action('wp_before_admin_bar_render', array('SmokeSignal', 'admin_toolbar_notification'), 50);
 
-        add_action('admin_head', array('SmokeSignal', 'wpss_admin_js'));
-
-//        if(!empty($_GET['view']) && $_GET['view'] == 'reply') {
+        if(!empty($_GET['view']) && $_GET['view'] == 'reply') {
             add_action('admin_footer', array('SmokeSignal', 'js_ajax_load_more_messages'));
-//        }
-
-        add_action('wp_ajax_smokesignal_load_more_messages', array('SmokeSignal','ajax_load_more_messages'));
+        }
+
+        if(!empty($_GET['page']) && $_GET['page'] == 'smokesignal') {
+            add_action('admin_head', array('SmokeSignal', 'wpss_admin_js'));
+        }
+        
+        add_action('wp_ajax_smokesignal_load_more_messages', array('SmokeSignal', 'ajax_load_more_messages'));
     }
 
@@ -153 +155 @@
             'messages' => self::get_communication($userId, $lastId),
         );
+
         echo self::view('single_message', $args);
 

smokesignal/trunk/class.smokesignal.php

@@ -14 +14 @@
     public static function init() {
         if (!self::$initiated) {
-            self::init_hooks();
+            self::init_hooks();
             self::enqueue();
         }
@@ -39 +39 @@
         add_action('wp_before_admin_bar_render', array('SmokeSignal', 'admin_toolbar_notification'), 50);
 
-        add_action('admin_head', array('SmokeSignal', 'wpss_admin_js'));
-
-//        if(!empty($_GET['view']) && $_GET['view'] == 'reply') {
+        if(!empty($_GET['view']) && $_GET['view'] == 'reply') {
             add_action('admin_footer', array('SmokeSignal', 'js_ajax_load_more_messages'));
-//        }
-
-        add_action('wp_ajax_smokesignal_load_more_messages', array('SmokeSignal','ajax_load_more_messages'));
+        }
+
+        if(!empty($_GET['page']) && $_GET['page'] == 'smokesignal') {
+            add_action('admin_head', array('SmokeSignal', 'wpss_admin_js'));
+        }
+        
+        add_action('wp_ajax_smokesignal_load_more_messages', array('SmokeSignal', 'ajax_load_more_messages'));
     }
 
@@ -153 +155 @@
             'messages' => self::get_communication($userId, $lastId),
         );
+
         echo self::view('single_message', $args);