Changeset 699228

Timestamp:

04/17/2013 05:40:49 PM (11 years ago)

Author:

jblz

Message:

Jetpack: Notes Module:

• Enqueue v2 scripts and style
• Prefix module-specific scripts and style to prevent collision
• Include lang and dir attributes on #wpnt-notes-panel so the notifications iframe can use these to display correctly

File:

• jetpack/trunk/modules/notes.php (modified) (3 diffs)

jetpack/trunk/modules/notes.php

@@ -123 +123 @@
 
     function styles_and_scripts() {
-        wp_enqueue_style( 'notes-admin-bar-rest', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/admin-bar-rest.css' ), array(), JETPACK_NOTES__CACHE_BUSTER );
+        wp_enqueue_style( '.css' ), array(), JETPACK_NOTES__CACHE_BUSTER );
         wp_enqueue_style( 'noticons', $this->wpcom_static_url( '/i/noticons/noticons.css' ), array(), JETPACK_NOTES__CACHE_BUSTER );
 
@@ -139 +139 @@
         }
 
-        wp_register_script( 'notes-rest-common', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/notes-rest-common.js' ), array( 'jquery', 'underscore', 'backbone', 'mustache', 'jquery.spin' ), JETPACK_NOTES__CACHE_BUSTER );
-        wp_enqueue_script( 'notes-admin-bar-rest', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/admin-bar-rest.js' ), array( 'notes-rest-common' ), JETPACK_NOTES__CACHE_BUSTER );
+        wp_register_script( '.js' ), array( 'jquery', 'underscore', 'backbone', 'mustache', 'jquery.spin' ), JETPACK_NOTES__CACHE_BUSTER );
+        wp_enqueue_script( '-common' ), JETPACK_NOTES__CACHE_BUSTER );
     }
 
@@ -156 +156 @@
                     </span>',
             'meta'   => array(
-                'html'  => '<div id="wpnt-notes-panel" style="display:none"><div class="wpnt-notes-panel-header"><span class="wpnt-notes-header">' . __('Notifications', 'jetpack') . '</span><span class="wpnt-notes-panel-link"></span></div></div>',
+                'html'  => '<div id="wpnt-notes-panel" style="display:none") . '</span><span class="wpnt-notes-panel-link"></span></div></div>',
                 'class' => 'menupop',
             ),