diff options
author | Chris Lawrence | 2013-06-26 21:21:19 -0400 |
---|---|---|
committer | Chris Lawrence | 2013-06-26 21:21:19 -0400 |
commit | ad086b897eafb9f314f75dfc8e451090b6bbf809 (patch) | |
tree | 9dd024d4fca3a57a6622b79ebbd05b888b8f3115 /js/reveal.js | |
parent | 173b4e7f257de850a547e024a83cb0dbee7507b8 (diff) | |
parent | 37c9246a6e7c1cc05e586724a2244f7c24c68995 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'js/reveal.js')
-rw-r--r-- | js/reveal.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/reveal.js b/js/reveal.js index e95ec74..676122f 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -272,6 +272,7 @@ var Reveal = (function(){ var data = { background: slide.getAttribute( 'data-background' ), backgroundSize: slide.getAttribute( 'data-background-size' ), + backgroundImage: slide.getAttribute( 'data-background-image' ), backgroundColor: slide.getAttribute( 'data-background-color' ), backgroundRepeat: slide.getAttribute( 'data-background-repeat' ), backgroundPosition: slide.getAttribute( 'data-background-position' ), @@ -293,6 +294,7 @@ var Reveal = (function(){ // Additional and optional background properties if( data.backgroundSize ) element.style.backgroundSize = data.backgroundSize; + if( data.backgroundImage ) element.style.backgroundImage = 'url("' + data.backgroundImage + '")'; if( data.backgroundColor ) element.style.backgroundColor = data.backgroundColor; if( data.backgroundRepeat ) element.style.backgroundRepeat = data.backgroundRepeat; if( data.backgroundPosition ) element.style.backgroundPosition = data.backgroundPosition; |