From 6c5b8ef0b65b739edde01106f89b001d76fcd0ec Mon Sep 17 00:00:00 2001 From: rolux Date: Tue, 5 Jun 2012 10:25:27 +0200 Subject: [PATCH] ListCalendar -> CalendarEditor; ListMap -> MapEditor --- .../{ListCalendar.js => CalendarEditor.js} | 9 ++++----- source/Ox.UI/js/Map/{ListMap.js => MapEditor.js} | 15 ++++++--------- source/Ox.UI/themes/classic/css/classic.css | 4 ++-- source/Ox.UI/themes/modern/css/modern.css | 4 ++-- 4 files changed, 14 insertions(+), 18 deletions(-) rename source/Ox.UI/js/Calendar/{ListCalendar.js => CalendarEditor.js} (99%) rename source/Ox.UI/js/Map/{ListMap.js => MapEditor.js} (99%) diff --git a/source/Ox.UI/js/Calendar/ListCalendar.js b/source/Ox.UI/js/Calendar/CalendarEditor.js similarity index 99% rename from source/Ox.UI/js/Calendar/ListCalendar.js rename to source/Ox.UI/js/Calendar/CalendarEditor.js index 8e55b0cd..cc745440 100644 --- a/source/Ox.UI/js/Calendar/ListCalendar.js +++ b/source/Ox.UI/js/Calendar/CalendarEditor.js @@ -1,14 +1,13 @@ 'use strict'; /*@ -Ox.ListCalendar List Calendar - ([options[, self]]) -> List Calendar +Ox.CalendarEditor Calendar Editor + ([options[, self]]) -> Calendar Editor options Options self Shared private variable @*/ -// FIXME: should be Ox.CalendarEditor -Ox.ListCalendar = function(options, self) { +Ox.CalendarEditor = function(options, self) { self = self || {}; var that = Ox.Element({}, self) @@ -553,7 +552,7 @@ Ox.ListCalendar = function(options, self) { ], orientation: 'horizontal' }) - .addClass('OxListMap') + .addClass('OxCalendarEditor') ); // if loaded with selection, set calendar and form diff --git a/source/Ox.UI/js/Map/ListMap.js b/source/Ox.UI/js/Map/MapEditor.js similarity index 99% rename from source/Ox.UI/js/Map/ListMap.js rename to source/Ox.UI/js/Map/MapEditor.js index 4c1935c1..6769eb98 100644 --- a/source/Ox.UI/js/Map/ListMap.js +++ b/source/Ox.UI/js/Map/MapEditor.js @@ -1,8 +1,8 @@ 'use strict'; /*@ -Ox.ListMap ListMap object - ([options[, self]]) -> ListMap object +Ox.MapEditor Map Editor + ([options[, self]]) -> Map Editor options Options object height Height in px labels If true, show labels @@ -13,9 +13,7 @@ Ox.ListMap ListMap object self Shared private variable @*/ -// FIXME: Should be Ox.MapEditor - -Ox.ListMap = function(options, self) { +Ox.MapEditor = function(options, self) { self = self || {}; var that = Ox.Element({}, self) @@ -777,7 +775,7 @@ Ox.ListMap = function(options, self) { ], orientation: 'horizontal' }) - .addClass('OxListMap') + .addClass('OxMapEditor') ); function addPlace() { @@ -1138,7 +1136,7 @@ Ox.ListMap = function(options, self) { that.focusList = function() { self.$list.gainFocus(); return that; - } + }; /*@ reloadList reloadList @@ -1146,13 +1144,12 @@ Ox.ListMap = function(options, self) { that.reloadList = function() { self.$list.reloadList(); return that; - } + }; /*@ resizeMap resizeMap @*/ that.resizeMap = function() { - Ox.Log('Map', 'Ox.ListMap.resizeMap()') self.$map.resizeMap(); return that; }; diff --git a/source/Ox.UI/themes/classic/css/classic.css b/source/Ox.UI/themes/classic/css/classic.css index 358f18eb..8d8a36c2 100644 --- a/source/Ox.UI/themes/classic/css/classic.css +++ b/source/Ox.UI/themes/classic/css/classic.css @@ -193,7 +193,7 @@ Calendar color: rgb(64, 64, 64); } -.OxThemeClassic .OxListCalendar .OxWarning { +.OxThemeClassic .OxCalendarEditor .OxWarning { border-bottom: 2px dotted rgb(255, 64, 64); } @@ -559,7 +559,7 @@ Maps .OxThemeClassic .OxTypeIcon { border-color: rgb(0, 0, 0); } -.OxThemeClassic .OxListMap .OxWarning { +.OxThemeClassic .OxMapEditor .OxWarning { border-bottom: 2px dotted rgb(255, 64, 64); } diff --git a/source/Ox.UI/themes/modern/css/modern.css b/source/Ox.UI/themes/modern/css/modern.css index b95201ad..8767364c 100644 --- a/source/Ox.UI/themes/modern/css/modern.css +++ b/source/Ox.UI/themes/modern/css/modern.css @@ -193,7 +193,7 @@ Calendar color: rgb(192, 192, 192); } -.OxThemeModern .OxListCalendar .OxWarning { +.OxThemeModern .OxCalendarEditor .OxWarning { border-bottom: 2px dotted rgb(192, 0, 0); } @@ -549,7 +549,7 @@ Maps .OxThemeModern .OxTypeIcon { border-color: rgb(255, 255, 255); } -.OxThemeModern .OxListMap .OxWarning { +.OxThemeModern .OxMapEditor .OxWarning { border-bottom: 2px dotted rgb(192, 0, 0); }