Merge remote-tracking branch 'origin/development' into development

Author: PhantomWatson

src/Template/Element/tags/editor.ctp

@@ -12,7 +12,8 @@ if (! isset($selectedTags)) {
 if (!isset($hideLabel)) {
     $hideLabel = false;
 }
-echo $this->Html->script('tag_manager.js');
+echo $this->Html->script('/data_center/js/tag_manager.js');
+echo $this->Html->css('/data_center/css/tag_editor.css');
 ?>
 
 <div class="input" id="tag_editing">
@@ -100,7 +101,7 @@ echo $this->Html->script('tag_manager.js');
 
 <?php
     if (! isset($options)) {
-        $options = array();
+        $options = [];
     }
     echo $this->Tag->setup($availableTags, $selectedTags, $options);
     if ($allow_custom) {

src/View/Helper/TagHelper.php

@@ -59,14 +59,12 @@ private function formatSelectedTags($selected_tags)
     }
     public function setup($available_tags, $selected_tags = [], $options = [])
     {
-        $this->Html->script('/data_center/js/tag_manager.js', ['inline' => false]);
-        $this->Html->css('/data_center/css/tag_editor.css', ['inline' => false]);
         $params = array(
-            'tags: '.$this->Js->object($this->availableTagsForJs($available_tags))
+            'tags: '.json_encode($this->availableTagsForJs($available_tags))
         );
         if (! empty($selected_tags)) {
             $selected_tags = $this->formatSelectedTags($selected_tags);
-            $params[] = 'selected_tags: '.$this->Js->object($this->selectedTagsForJs($selected_tags));
+            $params[] = 'selected_tags: '.json_encode($this->selectedTagsForJs($selected_tags));
         }
         if (! empty($options)) {
             foreach ($options as $var => $val) {
@@ -78,6 +76,10 @@ public function setup($available_tags, $selected_tags = [], $options = [])
                 $params[] = "$var: $val";
             }
         }
-        $this->Js->buffer('TagManager.init({'.implode(', ', $params).'});');
+        echo '
+            <script>
+                TagManager.init({'.implode(', ', $params).'});
+            </script>
+        ';
     }
 }

webroot/css/tag_editor.css

@@ -1,57 +1,59 @@
+// out: tag_editor.css, compress: true
+
 #tag_editing {
-	font-size: 90%; 
-	line-height: 16px; 
-	margin-bottom: 20px; 
-	overflow: visible; 
+	font-size: 90%;
+	line-height: 16px;
+	margin-bottom: 20px;
+	overflow: visible;
 	width: 100%;
-	
+
 	.label {
 		font-weight: bold;
 	}
 	img.expand_collapse {
-		height: 10px; 
+		height: 10px;
 		width: 10px;
 	}
-	img.expand_collapse, 
+	img.expand_collapse,
 	img.leaf {
-		margin-left: -15px; 
+		margin-left: -15px;
 		padding-right: 8px;
 	}
 }
 #available_tags {
 	border: 1px solid #aaa;
 	overflow: hidden;
 	padding: 5px;
-	
+
 	ul {
-		margin: 0; 
-		padding-left: 15px; 
+		margin: 0;
+		padding-left: 15px;
 		text-transform: capitalize;
-		
+
 		.submenu_handle {
 			cursor: pointer;
 		}
 	}
 	a {
 		&.selected {
-			color: #000; 
+			color: #000;
 			cursor: text;
-			
+
 			&:hover {
-				color: #000; 
+				color: #000;
 				text-decoration: none;
 			}
 		}
 	}
 	> div {
-		max-height: 300px; 
+		max-height: 300px;
 		overflow: auto;
 		position: relative;
 	}
 	.ui-widget-content {
 		a {
 			color: #0099BB;
-			
+
 			&.selected {
 				color: #000;
 			}
@@ -75,21 +77,21 @@
 	}
 }
 #tag_help_toggler {
-	float: right; 
+	float: right;
 	margin-left: 5px;
 }
 .ui-autocomplete {
 	font-size: 80%;
-	
+
 	li {
 		list-style-type: none;
 	}
 }
 .ui-effects-transfer {
-	background-color: rgba(0, 0, 0, 0.2); 
+	background-color: rgba(0, 0, 0, 0.2);
 	border: 1px dotted #555;
 	z-index: 10;
 }
 #custom_tag_input_wrapper {
 	margin-top: 15px;
-}
+}