Skip to content

Commit

Permalink
Merge branch '2.5'
Browse files Browse the repository at this point in the history
* 2.5:
  Update validators.eu.xlf
  fixed CS
  remove unused imports
  [Validator] Added markObjectAsInitialized() and isObjectInitialized() to ExecutionContextInterface
  [Validator] Fixed doc block
  [Routing] simplify the XML schema file
  Unify null comparisons
  [EventDispatcher] don't count empty listeners
  [Process] Fix unit tests in sigchild environment
  [Process] fix signal handling in wait()
  [BrowserKit] refactor code and fix unquoted regex
  Fixed server HTTP_HOST port uri conversion
  [HttpFoundation] moved test file to the right directory
  [Validator] Made sure that context changes don't leak out of (Contextual)ValidatorInterface
  [MonologBridge] fixed Console handler priorities
  Bring code into standard
  [Process] Add test to verify fix for issue symfony#11421
  [Process] Fixes issue symfony#11421
  [DependencyInjection] Pass a Scope instance instead of a scope name.
  • Loading branch information
fabpot committed Jul 28, 2014
2 parents a925358 + 1d5f927 commit 3b979bb
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Resources/views/Collector/time.html.twig
Expand Up @@ -370,7 +370,7 @@
this.getThreshold = function() {
var threshold = Sfjs.getPreference(_storagePrefix + 'threshold');
if (threshold === null) {
if (null === threshold) {
return _threshold;
}
Expand Down
16 changes: 8 additions & 8 deletions Resources/views/Profiler/layout.html.twig
Expand Up @@ -68,20 +68,20 @@
menu = document.getElementById('navigation'), savedState = Sfjs.getPreference('menu/displayState'),
displayState, elem, className;
if (savedState == null) {
if (null === savedState) {
savedState = 'block';
}
displayState = state || (savedState == 'block' ? 'none' : 'block');
displayState = state || ('block' === savedState ? 'none' : 'block');
if (typeof doSave === 'undefined') {
if ('undefined' === typeof doSave) {
doSave = true;
}
document.getElementById('searchBar').style.display = displayState;
document.getElementById('adminBar').style.display = displayState;
if (displayState == 'block') {
if ('block' === displayState) {
Sfjs.removeClass(menu, 'collapsed-menu');
Sfjs.removeClass(menu.parentNode.parentNode, 'collapsed-menu-parents');
Expand All @@ -107,7 +107,7 @@
}
window.setTimeout(function() {
if (document.getElementById('menu-profiler') == null) {
if (null === document.getElementById('menu-profiler')) {
return;
}
Expand All @@ -119,12 +119,12 @@
}
for (elem in menuItems) {
if (typeof(menuItems[elem].children) != 'undefined' &&
if (typeof(menuItems[elem].children) !== 'undefined' &&
menuItems[elem].children.length > 0) {
child = menuItems[elem].children[0]
if (child.getAttribute('title') == '' ||
child.getAttribute('title') == null) {
if ('' === child.getAttribute('title') ||
null === child.getAttribute('title')) {
value = child.text.replace(/^\s+/g, '').split('\n')[0].replace(/\s+$/g, '');
child.setAttribute('title', value);
}
Expand Down

0 comments on commit 3b979bb

Please sign in to comment.