r75744 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r75743‎ | r75744 | r75745 >
Date:20:25, 31 October 2010
Author:yaron
Status:ok
Tags:
Comment:
Removed my "workaround" for r75587 (the problem turned out to be coming from elsewhere); renamed RL modules to be "ext.semanticforms.*" instead of "semanticforms.*", to match correct convention; changed loading of SMW Javascript to come from SMW's own RL modules
Modified paths:
  • /trunk/extensions/SemanticForms/includes/SF_Utils.php (modified) (history)

Diff [purge]

Index: trunk/extensions/SemanticForms/includes/SF_Utils.php
@@ -109,14 +109,10 @@
110110 global $wgExtensionAssetsPath;
111111 $localpath = dirname( dirname( __FILE__ ) );
112112 $remotepath = "$wgExtensionAssetsPath/SemanticForms";
113 - // temporary workaround - using $wgExtensionAssetsPath
114 - // doesn't currently work
115 - global $sfgPartialPath;
116 - $remotepath = $sfgPartialPath;
117113
118114 $resourceLoader->register(
119115 array(
120 - 'semanticforms.main' => new ResourceLoaderFileModule(
 116+ 'ext.semanticforms.main' => new ResourceLoaderFileModule(
121117 array(
122118 'scripts' => 'libs/SemanticForms.js',
123119 'styles' => array(
@@ -125,25 +121,17 @@
126122 ),
127123 ), $localpath, $remotepath
128124 ),
129 - 'semanticforms.fancybox' => new ResourceLoaderFileModule(
 125+ 'ext.semanticforms.fancybox' => new ResourceLoaderFileModule(
130126 array(
131127 'scripts' => 'libs/jquery.fancybox-1.3.1.js',
132128 'styles' => 'skins/jquery.fancybox-1.3.1.css',
133129 ), $localpath, $remotepath
134130 ),
135 - 'semanticforms.autogrow' => new ResourceLoaderFileModule(
 131+ 'ext.semanticforms.autogrow' => new ResourceLoaderFileModule(
136132 array(
137133 'scripts' => 'libs/SF_autogrow.js',
138134 ), $localpath, $remotepath
139135 ),
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 - ),
148136 )
149137 );
150138
@@ -159,10 +147,11 @@
160148 $wgOut->addModules( 'jquery' );
161149 $wgOut->addModules( 'jquery.ui.autocomplete' );
162150 $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' );
167156 }
168157
169158 /**

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r75587(bug 25339) Allow specifying separate base paths for local and remote paths i...catrope22:22, 27 October 2010

Status & tagging log