tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-09-29 12:49:00 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #131 from mateusz/entwines2

Browse Source 
Refactor JS entwines
This commit is contained in:
Sean Harvey 2012-05-17 19:14:49 -07:00
commit 4e5e88ef2d
4 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
javascript/AssetAdmin.js
View File

@ -3,26 +3,25 @@
*/ */
(function($) { (function($) {
/**
* Delete selected folders through "batch actions" tab.
*/
$(document).ready(function() {
$('#Form_BatchActionsForm').entwine('ss').register(
// TODO Hardcoding of base URL
'admin/assets/batchactions/delete',
function(ids) {
var confirmed = confirm(
ss.i18n.sprintf(
ss.i18n._t('AssetAdmin.BATCHACTIONSDELETECONFIRM'),
ids.length
)
);
return (confirmed) ? ids : false;
}
);
});
$.entwine('ss', function($){ $.entwine('ss', function($){
/**
* Delete selected folders through "batch actions" tab.
*/
$(document).ready(function() {
$('#Form_BatchActionsForm').register(
// TODO Hardcoding of base URL
'admin/assets/batchactions/delete',
function(ids) {
var confirmed = confirm(
ss.i18n.sprintf(
ss.i18n._t('AssetAdmin.BATCHACTIONSDELETECONFIRM'),
ids.length
)
);
return (confirmed) ? ids : false;
}
);
});
/** /**
* Load folder detail view via controller methods * Load folder detail view via controller methods
@ -120,4 +119,4 @@
} }
}); });
}); });
}(jQuery)); }(jQuery));

3
javascript/CMSMain.AddForm.js
View File

@ -46,6 +46,7 @@
self.updateTypeList(); self.updateTypeList();
}); });
this.updateTypeList(); this.updateTypeList();
this._super();
}, },
/** /**
@ -106,4 +107,4 @@
} }
}); });
}); });
}(jQuery)); }(jQuery));

10
javascript/CMSMain.Tree.js
View File

@ -1,6 +1,6 @@
(function($) { (function($) {
$.entwine('ss', function($){ $.entwine('ss.tree', function($){
$('.cms-tree').entwine({ $('.cms-tree').entwine({
getTreeConfig: function() { getTreeConfig: function() {
var self = this, config = this._super(), hints = this.getHints(); var self = this, config = this._super(), hints = this.getHints();
@ -18,7 +18,7 @@
'label': '<span class="jstree-pageicon"></span>' + val.ssname, 'label': '<span class="jstree-pageicon"></span>' + val.ssname,
'_class': 'class-' + val.pagetype, '_class': 'class-' + val.pagetype,
'action': function(obj) { 'action': function(obj) {
$('.cms-container').loadPanel(ss.i18n.sprintf( $('.cms-container').entwine('.ss').loadPanel(ss.i18n.sprintf(
self.data('urlAddpage'), id, val.pagetype self.data('urlAddpage'), id, val.pagetype
)); ));
} }
@ -30,7 +30,7 @@
'edit': { 'edit': {
'label': ss.i18n._t('Tree.EditPage'), 'label': ss.i18n._t('Tree.EditPage'),
'action': function(obj) { 'action': function(obj) {
$('.cms-container').loadPanel(ss.i18n.sprintf( $('.cms-container').entwine('.ss').loadPanel(ss.i18n.sprintf(
self.data('urlEditpage'), obj.data('id') self.data('urlEditpage'), obj.data('id')
)); ));
} }
@ -41,7 +41,7 @@
menuitems['addsubpage'] = { menuitems['addsubpage'] = {
'label': ss.i18n._t('Tree.AddSubPage'), 'label': ss.i18n._t('Tree.AddSubPage'),
'action': function(obj) { 'action': function(obj) {
$('.cms-container').loadPanel(ss.i18n.sprintf( $('.cms-container').entwine('.ss').loadPanel(ss.i18n.sprintf(
self.data('urlAddpage'), id, 'Page' self.data('urlAddpage'), id, 'Page'
)); ));
}, },
@ -56,4 +56,4 @@
}); });
}); });
}(jQuery)); }(jQuery));

7
javascript/ReportAdmin.Tree.js
View File

@ -2,7 +2,7 @@
* File: ReportAdmin.Tree.js * File: ReportAdmin.Tree.js
*/ */
(function($) { (function($) {
$.entwine('ss', function($){ $.entwine('ss.tree', function($){
/** /**
* Class: .cms-tree * Class: .cms-tree
* *
@ -14,8 +14,11 @@
var id = $('.cms-edit-form :input[name=ID]').val(); var id = $('.cms-edit-form :input[name=ID]').val();
if (id) this[0].setCurrentByIdx(id); if (id) this[0].setCurrentByIdx(id);
this._super();
},
onunmatch: function() {
this._super(); this._super();
} }
}); });
}); });
}(jQuery)); }(jQuery));