Merge branch 'extending-entries' of github.com:bigbitecreative/livebl…

…og into extending-entries
Automattic · Jul 10, 2015 · 5bf69a1 · 5bf69a1
2 parents e3ac0c7 + 8791cc6
commit 5bf69a1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/classes/class-wpcom-liveblog-entry-extend.php b/classes/class-wpcom-liveblog-entry-extend.php
@@ -68,7 +68,7 @@ public static function load() {
      */
     public static function get_enabled_features()
     {
-    	return self::$features;
+    	return array_values( self::$features );
     }
 
     /**

diff --git a/css/liveblog.css b/css/liveblog.css
@@ -532,8 +532,7 @@ a.liveblog-form-entry::-webkit-input-placeholder {
 .liveblog-key-events .liveblog-entry-actions,
 .liveblog-key-events .liveblog-meta,
 .liveblog-key-events span,
-.liveblog-key-events img
-{
+.liveblog-key-events img {
 	display:none;
 }
 

diff --git a/js/liveblog.js b/js/liveblog.js
@@ -400,8 +400,26 @@ window.liveblog = window.liveblog || {};
 	};
 
 	liveblog.set_up_notification_settings = function() {
+		var feature_list = liveblog_settings.features.join(' '),
+			feature_test = /(commands|hashtags)/.test(feature_list);
+			feature_hashtags = /(hashtags)/.test(feature_list);
+			feature_commands = /(commands)/.test(feature_list);
 
-		// Cache DOM elements
+		// Make sure settings are enabled for either commands or hashtags
+		if ( ! feature_test ) {
+			return;
+		}
+
+		if ( ! feature_hashtags ) {
+			$('.liveblog-notification-tags-label').hide();
+		}
+
+		if ( ! feature_commands ) {
+			$('.liveblog-notification-key-label').hide();
+			$('.liveblog-notification-alerts-label').hide();
+		}
+
+		// Cache commonly used DOM elements
 		liveblog.$notification_tags = $('.liveblog-notification-tags'),
 		liveblog.$checkbox_enable = $('.liveblog-notification-enable'),
 		liveblog.$checkbox_key = $('.liveblog-notification-key'),

diff --git a/templates/liveblog-loop.php b/templates/liveblog-loop.php
@@ -14,13 +14,13 @@
 		</label>
 
 		<form class="liveblog-notification-options">
-			<label>
+			<label class="liveblog-notification-key-label">
 				<input type="checkbox" class="liveblog-notification-key"> <?php printf( __( 'Subscribe to key events' ) ); ?>
 			</label>
-			<label>
+			<label class="liveblog-notification-alerts-label">
 				<input type="checkbox" class="liveblog-notification-alerts"> <?php printf( __( 'Subscribe to author alerts ') ); ?>
 			</label>
-			<label> <?php printf( __( 'Tags to subscribe to (space separated):' ) ); ?>
+			<label class="liveblog-notification-tags-label"> <?php printf( __( 'Tags to subscribe to (space separated):' ) ); ?>
 				<div class="liveblog-notification-tags-wrap">
 					<input type="text" class="liveblog-notification-tags">
 					<div class="liveblog-notification-saved"></div>