0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

update map, url controller, icon list selection css

Browse source
This commit is contained in:
rlx 2011-10-02 21:49:59 +00:00
parent 5f20f84582
commit c624cc5082
4 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/Ox.UI/js/Core/Ox.URL.js
View file

@ -416,7 +416,9 @@ Ox.URL = function(options) {
function parseURL(str, callback) { function parseURL(str, callback) {
Ox.print('pU', str) Ox.print('pU', str)
var parts = str.substr(1).split('/'), // fixme: removing trailing slash makes it impossible to search for '/'
str = str.replace(/(^\/|\/$)/g, '');
var parts = str.split('/'),
state = {}; state = {};
if (parts[0] == '') { if (parts[0] == '') {
// empty URL // empty URL

3
source/Ox.UI/js/Map/Ox.Map.js
View file

@ -466,6 +466,7 @@ Ox.Map = function(options, self) {
} }
function clickMap(event) { function clickMap(event) {
var place = getSelectedPlace();
if (self.options.clickable/* && !editing()*/) { if (self.options.clickable/* && !editing()*/) {
getPlaceByLatLng(event.latLng, self.map.getBounds(), function(place) { getPlaceByLatLng(event.latLng, self.map.getBounds(), function(place) {
if (place) { if (place) {
@ -475,6 +476,8 @@ Ox.Map = function(options, self) {
selectPlace(null); selectPlace(null);
} }
}); });
} else {
pressEscape();
} }
} }

18
source/Ox.UI/themes/classic/css/classic.css
View file

@ -328,10 +328,10 @@ Lists
} }
.OxThemeClassic .OxIconList .OxItem.OxSelected > .OxIcon > img, .OxThemeClassic .OxIconList .OxItem.OxSelected > .OxIcon > img,
.OxThemeClassic .OxIconList .OxItem.OxSelected > .OxIcon > .OxVideoPlayer { .OxThemeClassic .OxIconList .OxItem.OxSelected > .OxIcon > .OxVideoPlayer {
border-color: rgb(160, 160, 160); border-color: rgb(192, 192, 192);
-moz-box-shadow: 0 0 4px rgba(160, 160, 160, 1); -moz-box-shadow: 0 0 4px rgba(192, 192, 192, 1);
-o-box-shadow: 0 0 4px rgba(160, 160, 160, 1); -o-box-shadow: 0 0 4px rgba(192, 192, 192, 1);
-webkit-box-shadow: 0 0 4px rgba(160, 160, 160, 1); -webkit-box-shadow: 0 0 4px rgba(192, 192, 192, 1);
} }
.OxThemeClassic .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon > img, .OxThemeClassic .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon > img,
.OxThemeClassic .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon > .OxVideoPlayer { .OxThemeClassic .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon > .OxVideoPlayer {
@ -347,11 +347,11 @@ Lists
rgb(255, 255, 255) 1px 1px 0; rgb(255, 255, 255) 1px 1px 0;
} }
.OxThemeClassic .OxIconList .OxItem.OxSelected > .OxText > div { .OxThemeClassic .OxIconList .OxItem.OxSelected > .OxText > div {
border-color: rgb(160, 160, 160); border-color: rgb(192, 192, 192);
background: rgba(160, 160, 160, 0.5); background: rgba(192, 192, 192, 0.5);
-moz-box-shadow: 0 0 4px rgba(160, 160, 160, 1); -moz-box-shadow: 0 0 4px rgba(192, 192, 192, 1);
-o-box-shadow: 0 0 4px rgba(160, 160, 160, 1); -o-box-shadow: 0 0 4px rgba(192, 192, 192, 1);
-webkit-box-shadow: 0 0 4px rgba(160, 160, 160, 1); -webkit-box-shadow: 0 0 4px rgba(192, 192, 192, 1);
} }
.OxThemeClassic .OxIconList.OxFocus .OxItem.OxSelected > .OxText > div { .OxThemeClassic .OxIconList.OxFocus .OxItem.OxSelected > .OxText > div {
border-color: rgb(128, 128, 128); border-color: rgb(128, 128, 128);

18
source/Ox.UI/themes/modern/css/modern.css
View file

@ -312,10 +312,10 @@ Lists
} }
.OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon > img, .OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon > img,
.OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon > .OxVideoPlayer { .OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon > .OxVideoPlayer {
border-color: rgb(96, 96, 96); border-color: rgb(64, 64, 64);
-moz-box-shadow: 0 0 4px rgba(96, 96, 96, 1); -moz-box-shadow: 0 0 4px rgba(64, 64, 64, 1);
-o-box-shadow: 0 0 4px rgba(96, 96, 96, 1); -o-box-shadow: 0 0 4px rgba(64, 64, 64, 1);
-webkit-box-shadow: 0 0 4px rgba(96, 96, 96, 1); -webkit-box-shadow: 0 0 4px rgba(64, 64, 64, 1);
} }
.OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon > img, .OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon > img,
.OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon .OxVideoPlayer { .OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon .OxVideoPlayer {
@ -331,11 +331,11 @@ Lists
rgb(0, 0, 0) 1px 1px 0; rgb(0, 0, 0) 1px 1px 0;
} }
.OxThemeModern .OxIconList .OxItem.OxSelected > .OxText > div { .OxThemeModern .OxIconList .OxItem.OxSelected > .OxText > div {
border-color: rgb(96, 96, 96); border-color: rgb(64, 64, 64);
background: rgba(96, 96, 96, 0.5); background: rgba(64, 64, 64, 0.5);
-moz-box-shadow: 0 0 4px rgba(96, 96, 96, 1); -moz-box-shadow: 0 0 4px rgba(64, 64, 64, 1);
-o-box-shadow: 0 0 4px rgba(96, 96, 96, 1); -o-box-shadow: 0 0 4px rgba(64, 64, 64, 1);
-webkit-box-shadow: 0 0 4px rgba(96, 96, 96, 1); -webkit-box-shadow: 0 0 4px rgba(64, 64, 64, 1);
} }
.OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxText > div { .OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxText > div {
border-color: rgb(128, 128, 128); border-color: rgb(128, 128, 128);