Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove crm.admin.js #12884

Merged
merged 1 commit into from
Oct 5, 2018
Merged

Remove crm.admin.js #12884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CRM/Admin/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function getDefaultContext() {
*/
public function preProcess() {
Civi::resources()->addStyleFile('civicrm', 'css/admin.css');
Civi::resources()->addScriptFile('civicrm', 'js/crm.admin.js');
Civi::resources()->addScriptFile('civicrm', 'js/jquery/jquery.crmIconPicker.js');

$this->_id = $this->get('id');
$this->_BAOName = $this->get('BAOName');
Expand Down
21 changes: 0 additions & 21 deletions js/crm.admin.js
View file
Open in desktop

This file was deleted.

9 changes: 7 additions & 2 deletions js/jquery/jquery.crmIconPicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@

function displayDialog() {
dialog.append('<style type="text/css">' +
'#crmIconPicker {font-size: 2em;}' +
'#crmIconPicker {font-size: 20px;}' +
'#crmIconPicker .icon-search input {font-family: FontAwesome; padding-left: .5em; margin-bottom: 1em;}' +
'#crmIconPicker a.ui-button {width: 2em; height: 2em; color: #222;}' +
'#crmIconPicker a.ui-button {width: 1em; height: 1em; color: #222;}' +
'#crmIconPicker a.ui-button .ui-icon {margin-top: -0.5em; width: auto; height: auto;}' +
'</style>' +
'<div class="icon-search"><input class="crm-form-text" name="search" placeholder="&#xf002"/></div>' +
Expand Down Expand Up @@ -117,4 +117,9 @@

});
};

$(document)
.on('crmLoad', function(e) {
$('.crm-icon-picker', e.target).not('.iconpicker-widget').crmIconPicker();
});
}(CRM.$, CRM._));