javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 21:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

url syntax fixed

Browse Source
This commit is contained in:
Vladimir Enchev
2015-03-20 11:00:59 +02:00
parent 6149a1f7d6
commit 355380a43b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ui/styling/style.ts
View File

@ -345,12 +345,13 @@ export var backgroundImageProperty = new styleProperty.Property("backgroundImage
function onBackgroundImagePropertyChanged(data: observable.PropertyChangeData) { function onBackgroundImagePropertyChanged(data: observable.PropertyChangeData) {
var style = <Style>data.object; var style = <Style>data.object;
var newValue = <string>data.newValue; var pattern: RegExp = /url\(('|")(.*?)\1\)/;
var url = (<string>data.newValue).match(pattern)[2];
if (imageSource.isFileOrResourcePath(newValue)) { if (imageSource.isFileOrResourcePath(url)) {
style._setValue(backgroundImageSourceProperty, imageSource.fromFileOrResource(newValue), observable.ValueSource.Local); style._setValue(backgroundImageSourceProperty, imageSource.fromFileOrResource(url), observable.ValueSource.Local);
} else if (types.isString(newValue)) { } else if (types.isString(url)) {
imageSource.fromUrl(newValue).then(r=> { imageSource.fromUrl(url).then(r=> {
style._setValue(backgroundImageSourceProperty, r, observable.ValueSource.Local); style._setValue(backgroundImageSourceProperty, r, observable.ValueSource.Local);
}); });
} }