[icinga-checkins] icinga.org: icinga-web/r1.5: Cleaning up JS code (fixes #2120)
git at icinga.org
git at icinga.org
Mon Nov 28 12:47:16 CET 2011
Module: icinga-web
Branch: r1.5
Commit: 46e7fcb6c8c814a5eb3b5a323d226645a15e1e70
URL: https://git.icinga.org/?p=icinga-web.git;a=commit;h=46e7fcb6c8c814a5eb3b5a323d226645a15e1e70
Author: Marius Hein <marius.hein at netways.de>
Date: Fri Nov 25 11:58:24 2011 +0100
Cleaning up JS code (fixes #2120)
Conflicts:
app/modules/AppKit/lib/js/AppKitUtil.js
app/modules/AppKit/lib/js/admin/UserEditForm.js
app/modules/AppKit/lib/js/admin/components/RoleListingGrid.js
app/modules/AppKit/lib/js/icinga/api/RESTFilterComboBox.js
app/modules/AppKit/lib/js/renderer/ColumnComponentRenderer.js
app/modules/Cronks/lib/js/CronkUtil.js
app/modules/Cronks/lib/js/Cronks/StatusOverall.js
app/modules/Cronks/lib/js/Cronks/Tackle/Cronk.js
app/modules/Cronks/lib/js/Cronks/Tackle/Filter/TackleMainFilterTbar.js
app/modules/Cronks/lib/js/Cronks/Tackle/ObjectGrid.js
app/modules/Cronks/lib/js/Cronks/Tackle/Relation/Head.js
app/modules/Cronks/lib/js/Cronks/Tackle/Renderer/CheckOutputRenderer.js
app/modules/Cronks/lib/js/Cronks/Tackle/Renderer/FlagIconColumnRenderer.js
app/modules/Cronks/lib/js/Cronks/Tackle/Renderer/ServiceHealthRenderer.js
app/modules/Cronks/lib/js/Cronks/Tackle/Renderer/StatusColumnRenderer.js
app/modules/Cronks/lib/js/Cronks/Tackle/ServicesSubGrid.js
app/modules/Cronks/lib/js/grid/IcingaCommandHandler.js
app/modules/Cronks/lib/js/grid/renderer/ColumnRenderer.js
app/modules/Cronks/lib/js/grid/renderer/StatusMapColumnRenderer.js
app/modules/Cronks/lib/js/search/SearchHandler.js
---
app/modules/AppKit/lib/js/AppKitErrorHandler.js | 2 +-
app/modules/AppKit/lib/js/AppKitNavBar.js | 12 ++--
app/modules/AppKit/lib/js/icinga/api/Provider.js | 8 ++--
.../AppKit/lib/js/icinga/grid/GridFactory.js | 22 ++++----
.../lib/js/icinga/grid/plugins/FilterableGrid.js | 49 ++++++++++----------
.../lib/js/icinga/grid/plugins/PageableGrid.js | 6 +-
.../lib/js/icinga/grid/plugins/SortableGrid.js | 4 +-
.../AppKit/lib/js/icinga/store/StoreFactory.js | 16 +++---
app/modules/AppKit/lib/js/request/Ajax.js | 6 +-
app/modules/Cronks/lib/js/Cronk.js | 4 +-
app/modules/Cronks/lib/js/CronkBuilder.js | 2 +-
app/modules/Cronks/lib/js/CronkTabpanel.js | 2 +-
app/modules/Cronks/lib/js/JitStatusMap.js | 2 +-
app/modules/Cronks/lib/js/StaticContentUtil.js | 2 +-
app/modules/Cronks/lib/js/Tabhelper.js | 2 +-
.../Cronks/lib/js/grid/IcingaCommandHandler.js | 3 +-
.../renderer/AdvancedHostStatusColumnRenderer.js | 10 ++--
.../Cronks/lib/js/grid/renderer/ColumnRenderer.js | 2 +-
.../lib/js/grid/renderer/CommentColumnRenderer.js | 18 ++++----
.../lib/js/grid/renderer/InfoIconColumnRenderer.js | 4 +-
20 files changed, 87 insertions(+), 89 deletions(-)
Diff: https://git.icinga.org/?p=icinga-web.git;a=commitdiff;h=46e7fcb6c8c814a5eb3b5a323d226645a15e1e70
More information about the icinga-checkins
mailing list