tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

FIX add_i18n_javascript calls not being updated after JS move

Browse Source 
This fixes alert / confirm boxes that were popping up without text (for
example silverstripe-cms/issues/1476), although ideally we wouldn't
show empty dialog boxes on this sort of error - we'd have some default,
or a way to detect the issue.
This commit is contained in:
Hamish Friedlander 2016-05-09 15:31:31 +12:00
parent d52058a4fd
commit 2af63a84ef
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.tx/config
View File

@ -8,7 +8,7 @@ source_lang = en
type = YML type = YML
[silverstripe-cms.master-js] [silverstripe-cms.master-js]
file_filter = javascript/lang/src/<lang>.js file_filter = client/lang/src/<lang>.js
source_file = javascript/lang/src/en.js source_file = client/lang/src/en.js
source_lang = en source_lang = en
type = KEYVALUEJSON type = KEYVALUEJSON

2
code/controllers/AssetAdmin.php
View File

@ -66,7 +66,7 @@ class AssetAdmin extends LeftAndMain implements PermissionProvider{
Versioned::set_stage(Versioned::DRAFT); Versioned::set_stage(Versioned::DRAFT);
Requirements::javascript(CMS_DIR . "/client/dist/js/AssetAdmin.js"); Requirements::javascript(CMS_DIR . "/client/dist/js/AssetAdmin.js");
Requirements::add_i18n_javascript(CMS_DIR . '/client/src/lang', false, true); Requirements::add_i18n_javascript(CMS_DIR . '/client/lang', false, true);
Requirements::css(CMS_DIR . '/client/dist/styles/bundle.css'); Requirements::css(CMS_DIR . '/client/dist/styles/bundle.css');
CMSBatchActionHandler::register('delete', 'AssetAdmin_DeleteBatchAction', 'Folder'); CMSBatchActionHandler::register('delete', 'AssetAdmin_DeleteBatchAction', 'Folder');
} }

2
code/controllers/CMSMain.php
View File

@ -70,7 +70,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
Requirements::css(CMS_DIR . '/client/dist/styles/bundle.css'); Requirements::css(CMS_DIR . '/client/dist/styles/bundle.css');
Requirements::customCSS($this->generatePageIconsCss()); Requirements::customCSS($this->generatePageIconsCss());
Requirements::add_i18n_javascript(CMS_DIR . '/client/src/lang', false, true); Requirements::add_i18n_javascript(CMS_DIR . '/client/lang', false, true);
Requirements::javascript(CMS_DIR . '/client/dist/js/bundle-legacy.js', [ Requirements::javascript(CMS_DIR . '/client/dist/js/bundle-legacy.js', [
'provides' => [ 'provides' => [
CMS_DIR . '/client/dist/js/CMSMain.AddForm.js', CMS_DIR . '/client/dist/js/CMSMain.AddForm.js',

2
code/forms/SiteTreeURLSegmentField.php
View File

@ -38,7 +38,7 @@ class SiteTreeURLSegmentField extends TextField {
public function Field($properties = array()) { public function Field($properties = array()) {
Requirements::javascript(CMS_DIR . '/client/dist/js/SiteTreeURLSegmentField.js'); Requirements::javascript(CMS_DIR . '/client/dist/js/SiteTreeURLSegmentField.js');
Requirements::add_i18n_javascript(CMS_DIR . '/client/src/lang', false, true); Requirements::add_i18n_javascript(CMS_DIR . '/client/lang', false, true);
Requirements::css(FRAMEWORK_ADMIN_DIR . '/client/dist/styles/bundle.css'); Requirements::css(FRAMEWORK_ADMIN_DIR . '/client/dist/styles/bundle.css');
return parent::Field($properties); return parent::Field($properties);
} }