| Index: branches/js2-work/phase3/js/mwEmbed/modules/AjaxCategories/mw.AjaxCategories.js |
| — | — | @@ -12,13 +12,11 @@ |
| 13 | 13 | "ajax-remove-category-error" : "[RemoveErr]" |
| 14 | 14 | } ); |
| 15 | 15 | |
| 16 | | -var defaultAjaxCategoriesOptions = { |
| 17 | | - |
| | 16 | +var defaultAjaxCategoriesOptions = { |
| 18 | 17 | // The edit mode can be api, or text box. |
| 19 | 18 | // When set to api, category changes are saved to the target article page |
| 20 | | - // when set to textbox category changes are outputed to a text box. |
| 21 | | - 'editMode' : 'api' |
| 22 | | - |
| | 19 | + // when set to textbox category changes are outputted to a text box. |
| | 20 | + 'editMode' : 'api' |
| 23 | 21 | } |
| 24 | 22 | |
| 25 | 23 | /** |
| Index: branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php |
| — | — | @@ -16,7 +16,7 @@ |
| 17 | 17 | } |
| 18 | 18 | // No cache hit, load stand alone ScriptLoader config |
| 19 | 19 | |
| 20 | | - // ( if running as a remote, mediaWiki variables are already included as part of mediaWiki |
| | 20 | + // ( if running as a remote, mediaWiki variables / functions are already included as part of mediaWiki ) |
| 21 | 21 | require_once( realpath( dirname( __FILE__ ) ) . '/includes/noMediaWikiConfig.php' ); |
| 22 | 22 | $myScriptLoader->doScriptLoader(); |
| 23 | 23 | } |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | // Error msg |
| 44 | 44 | var $errorMsg = ''; |
| 45 | 45 | |
| 46 | | - // Output format is either 'js' or 'css'; |
| | 46 | + // Output format is either 'js' or 'css' or 'messages' for exclusivly msg text; |
| 47 | 47 | var $outputFormat = 'js'; |
| 48 | 48 | |
| 49 | 49 | // Debug flag |
| — | — | @@ -414,7 +414,6 @@ |
| 415 | 415 | * Get the URI of the scriptLoader |
| 416 | 416 | */ |
| 417 | 417 | private function getScriptLoaderUri() { |
| 418 | | - |
| 419 | 418 | // protocol is http or https |
| 420 | 419 | $protocol = 'http'; |
| 421 | 420 | if ($_SERVER['SERVER_PORT'] == 443 || (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')) { |
| — | — | @@ -694,6 +693,7 @@ |
| 695 | 694 | // Else just return the key unchanged: |
| 696 | 695 | return $langKey; |
| 697 | 696 | } |
| | 697 | + |
| 698 | 698 | /** |
| 699 | 699 | * Get a file path for a given class |
| 700 | 700 | * |
| — | — | @@ -1119,7 +1119,7 @@ |
| 1120 | 1120 | return true; |
| 1121 | 1121 | } |
| 1122 | 1122 | /** |
| 1123 | | - * Checks cache directories and makes the dirs if not present |
| | 1123 | + * Checks cache directories and creates the directories if not present |
| 1124 | 1124 | */ |
| 1125 | 1125 | protected function checkCacheDirs() { |
| 1126 | 1126 | $mydir2 = substr( $this->filename, 0, strrpos( $this->filename, '/' ) ); # subdirectory level 2 |