Joomla.JText use scriptOptions 'joomla.jtext'

joomla · Aug 21, 2016 · b83b6bd · b83b6bd
1 parent b498871
commit b83b6bd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 30 deletions.
diff --git a/libraries/joomla/document/renderer/html/head.php b/libraries/joomla/document/renderer/html/head.php
@@ -268,16 +268,6 @@ public function fetchHead($document)
 			$buffer .= $tab . '</script>' . $lnEnd;
 		}
 
-		// Generate script language declarations.
-		if (JText::script())
-		{
-			$prettyPrint = (JDEBUG && defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : false);
-
-			$buffer .= $tab . '<script type="application/json" id="joomla-text-strings">';
-			$buffer .= json_encode(JText::script(), $prettyPrint);
-			$buffer .= '</script>' . $lnEnd;
-		}
-
 		// Output the custom tags - array_unique makes sure that we don't output the same tags twice
 		foreach (array_unique($document->_custom) as $custom)
 		{

diff --git a/libraries/joomla/language/text.php b/libraries/joomla/language/text.php
@@ -387,6 +387,9 @@ public static function script($string = null, $jsSafe = false, $interpretBackSla
 
 			// Load core.js dependency
 			JHtml::_('behavior.core');
+
+			// Update Joomla.JText script options
+			JFactory::getDocument()->addScriptOptions('joomla.jtext', self::$strings, false);
 		}
 
 		return self::$strings;

diff --git a/media/system/js/core-uncompressed.js b/media/system/js/core-uncompressed.js
@@ -72,7 +72,8 @@ Joomla.editors.instances = Joomla.editors.instances || {};
 		'_': function( key, def ) {
 
 			if (!this.preloaded) {
-				this.preload();
+				this.load(Joomla.getOptions('joomla.jtext', {}));
+				this.preloaded = true;
 			}
 
 			def = def === undefined ? '' : def;
@@ -90,24 +91,6 @@ Joomla.editors.instances = Joomla.editors.instances || {};
 				if (!object.hasOwnProperty(key)) continue;
 				this.strings[ key.toUpperCase() ] = object[ key ];
 			}
-			return this;
-		},
-
-		/**
-		 * Preload strings from <script type="application/json" id="joomla-text-strings"> container
-		 *
-		 * @param {String} id   Id of the container
-		 * @returns {Joomla.JText}
-		 */
-		preload: function( id ) {
-			id = id || 'joomla-text-strings';
-			var element = document.getElementById(id),
-				str = element ? (element.text || element.textContent) : null,
-				options = str ? JSON.parse(str) : null;
-
-			this.load(options || {});
-			this.preloaded = true;
-
 			return this;
 		}
 	};

diff --git a/media/system/js/core.js b/media/system/js/core.js