diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | src/library_sdl.js | 5 | ||||
| -rw-r--r-- | src/shell.html | 2 | ||||
| -rw-r--r-- | tests/embind/shell.html | 2 | ||||
| -rw-r--r-- | tests/sdl_canvas_size.html | 2 | ||||
| -rw-r--r-- | tests/test_browser.py | 6 |
6 files changed, 12 insertions, 7 deletions
@@ -109,4 +109,4 @@ a license to everyone to use it as detailed in LICENSE.) * Bob Roberts <bobroberts177@gmail.com> * John Vilk <jvilk@cs.umass.edu> * Daniel Baulig <dbaulig@fb.com> (copyright owned by Facebook, Inc.) - +* Lu Wang <coolwanglu@gmail.com> diff --git a/src/library_sdl.js b/src/library_sdl.js index 8fd06a43..67b63885 100644 --- a/src/library_sdl.js +++ b/src/library_sdl.js @@ -1247,6 +1247,11 @@ var LibrarySDL = { return 0; }, + SDL_LowerBlit__deps: ['SDL_UpperBlit'], + SDL_LowerBlit: function(src, srcrect, dst, dstrect) { + return _SDL_UpperBlit(src, srcrect, dst, dstrect); + }, + SDL_FillRect: function(surf, rect, color) { var surfData = SDL.surfaces[surf]; assert(!surfData.locked); // but we could unlock and re-lock if we must.. diff --git a/src/shell.html b/src/shell.html index 53a4fffb..efb9e91d 100644 --- a/src/shell.html +++ b/src/shell.html @@ -50,7 +50,7 @@ //text = text.replace(/>/g, ">"); //text = text.replace('\n', '<br>', 'g'); element.value += text + "\n"; - element.scrollTop = 99999; // focus on bottom + element.scrollTop = element.scrollHeight; // focus on bottom }; })(), printErr: function(text) { diff --git a/tests/embind/shell.html b/tests/embind/shell.html index f0ee10f8..7a3b0a07 100644 --- a/tests/embind/shell.html +++ b/tests/embind/shell.html @@ -48,7 +48,7 @@ //text = text.replace(/>/g, ">"); //text = text.replace('\n', '<br>', 'g'); element.value += text + "\n"; - element.scrollTop = 99999; // focus on bottom + element.scrollTop = element.scrollHeight; // focus on bottom }; })(), printErr: function(text) { diff --git a/tests/sdl_canvas_size.html b/tests/sdl_canvas_size.html index 50495049..37e3818f 100644 --- a/tests/sdl_canvas_size.html +++ b/tests/sdl_canvas_size.html @@ -51,7 +51,7 @@ //text = text.replace(/>/g, ">"); //text = text.replace('\n', '<br>', 'g'); element.value += text + "\n"; - element.scrollTop = 99999; // focus on bottom + element.scrollTop = element.scrollHeight; // focus on bottom }; })(), printErr: function(text) { diff --git a/tests/test_browser.py b/tests/test_browser.py index 128820b3..b2cd62f8 100644 --- a/tests/test_browser.py +++ b/tests/test_browser.py @@ -183,7 +183,7 @@ If manually bisecting: //text = text.replace(/>/g, ">"); //text = text.replace('\\n', '<br>', 'g'); element.value += text + "\\n"; - element.scrollTop = 99999; // focus on bottom + element.scrollTop = element.scrollHeight; // focus on bottom }; })(), printErr: function(text) { @@ -274,7 +274,7 @@ If manually bisecting: //text = text.replace(/>/g, ">"); //text = text.replace('\\n', '<br>', 'g'); element.value += text + "\\n"; - element.scrollTop = 99999; // focus on bottom + element.scrollTop = element.scrollHeight; // focus on bottom }; })(), printErr: function(text) { @@ -898,7 +898,7 @@ keydown(100);keyup(100); // trigger the end return function(text) { text = Array.prototype.slice.call(arguments).join(' '); element.value += text + "\\n"; - element.scrollTop = 99999; // focus on bottom + element.scrollTop = element.scrollHeight; // focus on bottom }; })() }; |