← All changes | framework/developer/interface/block/shortcode/shortcode.php +8 -9 11.2 → 6.0.14 View file →

		@@ -8,9 +8,9 @@
8	8
9	9	/**
10	10	*
11	11	*/
12		-class CJT_Framework_Developer_Interface_Block_Shortcode_Shortcode {
	12	+class CJT_Framework_Developer_Interface_Block_Shortcode {
13	13
14	14	/**
15	15	* put your comment there...
16	16	*
		@@ -51,9 +51,9 @@
51	51	*
52	52	* @var CJT_Framework_Developer_Interface_Block_Shortcode_Segments
53	53	*/
54	54	protected $segments = null;
55		-
	55	+
56	56	/**
57	57	* put your comment there...
58	58	*
59	59	* @param mixed $block
		@@ -64,14 +64,12 @@
64	64	public function __construct($block, $parameters, & $content) {
65	65	// Initialize.
66	66	$this->block = $block;
67	67	$this->content =& $content;
68		- $this->parameters = new CJT_Framework_Developer_Interface_Block_Shortcode_Parameters_Parameters(
69		- new CJT_Models_Block_Parameters_Parameters($block->id)
70		- );
71		- // Load from shortcode parameters.
72		- $this->parameters->loadString($parameters, $content);
73		- //$this->segments = new CJT_Framework_Developer_Interface_Block_Shortcode_Segments_Segments($this->cleanContent());
	68	+ cssJSToolbox::import('framework:developer:interface:block:parameters:parameters.php');
	69	+ $this->parameters = new CJT_Framework_Developer_Interface_Block_Parameters($parameters);
	70	+ cssJSToolbox::import('framework:developer:interface:block:shortcode:segments:segments.php');
	71	+ $this->segments = new CJT_Framework_Developer_Interface_Block_Shortcode_Segments($this->cleanContent());
74	72	// Generate Shortcode block container id.
75	73	$this->bcid = md5(microtime());
76	74	// Build block container element id.
77	75	$this->containerElementId = "csmi-{$this->bcid}";
		@@ -138,9 +136,10 @@
138	136	public function fw() {
139	137	static $fw = null;
140	138	// Instantiate framework only when used.
141	139	if (!$fw) {
142		- $fw = new CJT_Framework_Developer_Developer($this->block);
	140	+ cssJSToolbox::import('framework:developer:developer.php');
	141	+ $fw = new CJT_Framework_Developer($this->block);
143	142	}
144	143	return $fw;
145	144	}
146	145