Index: trunk/extensions/SemanticForms/includes/SF_Utils.php |
— | — | @@ -109,14 +109,10 @@ |
110 | 110 | global $wgExtensionAssetsPath; |
111 | 111 | $localpath = dirname( dirname( __FILE__ ) ); |
112 | 112 | $remotepath = "$wgExtensionAssetsPath/SemanticForms"; |
113 | | - // temporary workaround - using $wgExtensionAssetsPath |
114 | | - // doesn't currently work |
115 | | - global $sfgPartialPath; |
116 | | - $remotepath = $sfgPartialPath; |
117 | 113 | |
118 | 114 | $resourceLoader->register( |
119 | 115 | array( |
120 | | - 'semanticforms.main' => new ResourceLoaderFileModule( |
| 116 | + 'ext.semanticforms.main' => new ResourceLoaderFileModule( |
121 | 117 | array( |
122 | 118 | 'scripts' => 'libs/SemanticForms.js', |
123 | 119 | 'styles' => array( |
— | — | @@ -125,25 +121,17 @@ |
126 | 122 | ), |
127 | 123 | ), $localpath, $remotepath |
128 | 124 | ), |
129 | | - 'semanticforms.fancybox' => new ResourceLoaderFileModule( |
| 125 | + 'ext.semanticforms.fancybox' => new ResourceLoaderFileModule( |
130 | 126 | array( |
131 | 127 | 'scripts' => 'libs/jquery.fancybox-1.3.1.js', |
132 | 128 | 'styles' => 'skins/jquery.fancybox-1.3.1.css', |
133 | 129 | ), $localpath, $remotepath |
134 | 130 | ), |
135 | | - 'semanticforms.autogrow' => new ResourceLoaderFileModule( |
| 131 | + 'ext.semanticforms.autogrow' => new ResourceLoaderFileModule( |
136 | 132 | array( |
137 | 133 | 'scripts' => 'libs/SF_autogrow.js', |
138 | 134 | ), $localpath, $remotepath |
139 | 135 | ), |
140 | | - 'semanticforms.smw_utilities' => new ResourceLoaderFileModule( |
141 | | - array( |
142 | | - 'scripts' => array( |
143 | | - 'skins/SMW_tooltip.js', |
144 | | - 'skins/SMW_sorttable.js', |
145 | | - ) |
146 | | - ), $localpath, $remotepath |
147 | | - ), |
148 | 136 | ) |
149 | 137 | ); |
150 | 138 | |
— | — | @@ -159,10 +147,11 @@ |
160 | 148 | $wgOut->addModules( 'jquery' ); |
161 | 149 | $wgOut->addModules( 'jquery.ui.autocomplete' ); |
162 | 150 | $wgOut->addModules( 'jquery.ui.button' ); |
163 | | - $wgOut->addModules( 'semanticforms.main' ); |
164 | | - $wgOut->addModules( 'semanticforms.fancybox' ); |
165 | | - $wgOut->addModules( 'semanticforms.autogrow' ); |
166 | | - $wgOut->addModules( 'semanticforms.smw_utilities' ); |
| 151 | + $wgOut->addModules( 'ext.semanticforms.main' ); |
| 152 | + $wgOut->addModules( 'ext.semanticforms.fancybox' ); |
| 153 | + $wgOut->addModules( 'ext.semanticforms.autogrow' ); |
| 154 | + $wgOut->addModules( 'ext.smw.tooltips' ); |
| 155 | + $wgOut->addModules( 'ext.smw.sorttable' ); |
167 | 156 | } |
168 | 157 | |
169 | 158 | /** |