[SHINDIG-1386] Allow additional javascript feature directories e.g. in the extras folder

• Type: New Feature
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 2.0.0-RC2
• Component/s: PHP
• Assignee: Unassigned
• Reporter: Bastian Hofmann
• Created: 15/Jul/10 11:22
• Updated: 19/Jul/10 08:13
• Resolved: 19/Jul/10 08:13

Description

Index: php/config/container.php
===================================================================
117c117,120
< 'features_path' => realpath(dirname(_FILE_) . '/../../features/src/main/javascript/features') . '/',
—
> 'features_path' => array(
> realpath(dirname(_FILE_) . '/../../features/src/main/javascript/features') . '/',
> realpath(dirname(_FILE_) . '/../../extras/src/main/javascript/features-extras') . '/',
> ),

Index: php/src/gadgets/GadgetFeatureRegistry.php
===================================================================
28,30c28,29
< public $features;
< private $coreDone = false;
< private $coreFeaturs;
—
> public $features = array();
> private $coreFeatures;
33a33,37
> if (is_array($featurePath)) {
> foreach ($featurePath as $path)

{ > $this->registerFeatures($path); > }

> } else

{ 36a41,43 > $this->processFeatures(); > }

>
137d143
< $this->features = array();
151a158,163
> }
>
> /**
> * gets core features and sorts features
> */
> private function processFeatures() {

Index: php/src/gadgets/GadgetContext.php
===================================================================
120c120,121
< if (! ($registry = $featureCache->get(md5(Config::get('features_path'))))) {
—
> $key = md5(implode(',', Config::get('features_path')));
> if (! ($registry = $featureCache->get($key))) {
122c123
< $featureCache->set(md5(Config::get('features_path')), $registry);
—
> $featureCache->set($key, $registry);

Also in the existing features-extras directory the features.txt has to wrong path to the feature.xml:

Index: extras/src/main/javascript/features-extras/features.txt
===================================================================
19c19
< features/org.jquery.core-1.4.2/feature.xml
—
> features-extras/org.jquery.core-1.4.2/feature.xml