← All changes
|
framework/developer/interface/block/shortcode/parameters/parameters.php
+13
-13
trunk
→
10
View file →
| @@ -1,11 +1,11 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | -* | |
| 3 | +* | |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | 6 | /** |
| 7 | -* | |
| 7 | +* | |
| 8 | 8 | */ |
| 9 | 9 | class CJT_Framework_Developer_Interface_Block_Shortcode_Parameters_Parameters |
| 10 | 10 | extends CJT_Framework_Developer_Interface_Block_Parameters_Parameters { |
| 11 | 11 | |
| @@ -10,9 +10,9 @@ | ||
| 10 | 10 | extends CJT_Framework_Developer_Interface_Block_Parameters_Parameters { |
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * Block programming interface (BPI). |
| 14 | - * | |
| 14 | + * | |
| 15 | 15 | * @param mixed $name |
| 16 | 16 | */ |
| 17 | 17 | public function get($name) { |
| 18 | 18 | // Initialize. |
| @@ -31,17 +31,17 @@ | ||
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | 34 | * put your comment there... |
| 35 | - * | |
| 35 | + * | |
| 36 | 36 | */ |
| 37 | 37 | protected function getFactory() { |
| 38 | 38 | return new CJT_Framework_Developer_Interface_Block_Shortcode_Parameters_Factory(); |
| 39 | 39 | } |
| 40 | - | |
| 40 | + | |
| 41 | 41 | /** |
| 42 | 42 | * put your comment there... |
| 43 | - * | |
| 43 | + * | |
| 44 | 44 | * @param mixed $strings |
| 45 | 45 | * @param mixed $content |
| 46 | 46 | * @return CJT_Framework_Developer_Interface_Block_Shortcode_Parameters_Parameters |
| 47 | 47 | */ |
| @@ -56,13 +56,13 @@ | ||
| 56 | 56 | // Dont override default value unless parameter is passed! |
| 57 | 57 | if (isset($strings[$name])) { |
| 58 | 58 | $param->loadString($strings[$name]); |
| 59 | 59 | } |
| 60 | - // Validate type! | |
| 60 | + // Validate type! | |
| 61 | 61 | if (!$param->validate()) { |
| 62 | 62 | echo cssJSToolbox::getText("Invalid Shortcode parameter: {$type->getMessage()}"); |
| 63 | 63 | } |
| 64 | - // Remove the value from the stringsValue allow validating if | |
| 64 | + // Remove the value from the stringsValue allow validating if | |
| 65 | 65 | // any invalid parameter name is passed! |
| 66 | 66 | // See after the loop. |
| 67 | 67 | unset($strings[$name]); |
| 68 | 68 | } |
| @@ -74,9 +74,9 @@ | ||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /** |
| 77 | 77 | * put your comment there... |
| 78 | - * | |
| 78 | + * | |
| 79 | 79 | * @param mixed $excludes |
| 80 | 80 | * @param array Parameters to include (Will be merged to params) |
| 81 | 81 | * @return string JSON of the parameters list. |
| 82 | 82 | */ |
| @@ -126,21 +126,21 @@ | ||
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | /** |
| 129 | 129 | * put your comment there... |
| 130 | - * | |
| 130 | + * | |
| 131 | 131 | * @param mixed $blockName |
| 132 | 132 | */ |
| 133 | 133 | public function shortcode($blockName) { |
| 134 | 134 | // Initialize. |
| 135 | - $shortcode = "[cjtoolbox name='{$blockName}'%s]%s[/cjtoolbox]"; | |
| 135 | + $shortcode = "[cjtoolbox name='{$blockName}'%s]%s[/cjtoolbox]"; // <-- CODE MODIFIED BY RBJ | |
| 136 | 136 | $shortcodeContent = ''; |
| 137 | 137 | $params = $this->getParams(); |
| 138 | - $attributes = array(); | |
| 138 | + $attributes = array(); | |
| 139 | 139 | // Process all parameters except of the Shortcode Content parameter. |
| 140 | 140 | if ($contentParameter = $this->getContentParameter()) { |
| 141 | 141 | // Remove it from the list as it will be added as content rather than attribute. |
| 142 | - unset($params[$contentParameter->getDefinition()->getName(true)]); | |
| 142 | + unset($params[$contentParameter->getDefinition()->getName(true)]); | |
| 143 | 143 | // Get Content Parameter data. |
| 144 | 144 | $shortcodeContent = $contentParameter->getValue(); |
| 145 | 145 | } |
| 146 | 146 | // Aggregate all parameters strings in one array! |