projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #12123 from eileenmcnaughton/membership_type
[civicrm-core.git]
/
js
/
Common.js
diff --git
a/js/Common.js
b/js/Common.js
index 691df6c15e222b651ce25c73fe6e1aa073c3e41e..43cc526b7213c192b4d2e000f7634bbe9720f7b6 100644
(file)
--- a/
js/Common.js
+++ b/
js/Common.js
@@
-1260,7
+1260,8
@@
if (!CRM.vars) CRM.vars = {};
if (title.length) {
text = title + "\n" + text;
}
if (title.length) {
text = title + "\n" + text;
}
- alert(text);
+ // strip html tags as they are not parsed in standard alerts
+ alert($("<div/>").html(text).text());
return null;
}
};
return null;
}
};
@@
-1592,6
+1593,10
@@
if (!CRM.vars) CRM.vars = {};
return format.replace(/1.*234.*56/, result);
};
return format.replace(/1.*234.*56/, result);
};
+ CRM.angRequires = function(name) {
+ return CRM.angular.requires[name] || [];
+ };
+
CRM.console = function(method, title, msg) {
if (window.console) {
method = $.isFunction(console[method]) ? method : 'log';
CRM.console = function(method, title, msg) {
if (window.console) {
method = $.isFunction(console[method]) ? method : 'log';