Title: [111511] trunk/Tools
- Revision
- 111511
- Author
- [email protected]
- Date
- 2012-03-21 01:56:53 -0700 (Wed, 21 Mar 2012)
Log Message
[GTK] Allow running _javascript_ from location bar in MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=81331
Reviewed by Martin Robinson.
* MiniBrowser/gtk/BrowserWindow.c:
(activateUriEntryCallback): Use browser_window_load_uri().
(browser_window_load_uri): Check whether uri starts with
_javascript_: and run the given script, or just call
webkit_web_view_load_uri() to load the given uri.
* MiniBrowser/gtk/BrowserWindow.h:
* MiniBrowser/gtk/main.c:
(createBrowserWindow): Use browser_window_load_uri().
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (111510 => 111511)
--- trunk/Tools/ChangeLog 2012-03-21 08:44:23 UTC (rev 111510)
+++ trunk/Tools/ChangeLog 2012-03-21 08:56:53 UTC (rev 111511)
@@ -1,5 +1,21 @@
2012-03-21 Carlos Garcia Campos <[email protected]>
+ [GTK] Allow running _javascript_ from location bar in MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=81331
+
+ Reviewed by Martin Robinson.
+
+ * MiniBrowser/gtk/BrowserWindow.c:
+ (activateUriEntryCallback): Use browser_window_load_uri().
+ (browser_window_load_uri): Check whether uri starts with
+ _javascript_: and run the given script, or just call
+ webkit_web_view_load_uri() to load the given uri.
+ * MiniBrowser/gtk/BrowserWindow.h:
+ * MiniBrowser/gtk/main.c:
+ (createBrowserWindow): Use browser_window_load_uri().
+
+2012-03-21 Carlos Garcia Campos <[email protected]>
+
[GTK] Add webkit_web_view_run_javascript() to WebKit2 GTK+
https://bugs.webkit.org/show_bug.cgi?id=75543
Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (111510 => 111511)
--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2012-03-21 08:44:23 UTC (rev 111510)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2012-03-21 08:56:53 UTC (rev 111511)
@@ -27,6 +27,7 @@
#include "BrowserWindow.h"
#include "BrowserSettingsDialog.h"
+#include <string.h>
enum {
PROP_0,
@@ -77,7 +78,7 @@
static void activateUriEntryCallback(BrowserWindow *window)
{
- webkit_web_view_load_uri(window->webView, gtk_entry_get_text(GTK_ENTRY(window->uriEntry)));
+ browser_window_load_uri(window, gtk_entry_get_text(GTK_ENTRY(window->uriEntry)));
}
static void reloadCallback(BrowserWindow *window)
@@ -480,3 +481,16 @@
return window->webView;
}
+
+void browser_window_load_uri(BrowserWindow *window, const char *uri)
+{
+ g_return_if_fail(BROWSER_IS_WINDOW(window));
+ g_return_if_fail(uri);
+
+ if (!g_str_has_prefix(uri, "_javascript_:")) {
+ webkit_web_view_load_uri(window->webView, uri);
+ return;
+ }
+
+ webkit_web_view_run_javascript(window->webView, strstr(uri, "_javascript_:"), NULL, NULL);
+}
Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.h (111510 => 111511)
--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.h 2012-03-21 08:44:23 UTC (rev 111510)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.h 2012-03-21 08:56:53 UTC (rev 111511)
@@ -45,6 +45,7 @@
GtkWidget* browser_window_new(WebKitWebView*);
WebKitWebView* browser_window_get_view(BrowserWindow*);
+void browser_window_load_uri(BrowserWindow *, const char *uri);
G_END_DECLS
Modified: trunk/Tools/MiniBrowser/gtk/main.c (111510 => 111511)
--- trunk/Tools/MiniBrowser/gtk/main.c 2012-03-21 08:44:23 UTC (rev 111510)
+++ trunk/Tools/MiniBrowser/gtk/main.c 2012-03-21 08:56:53 UTC (rev 111511)
@@ -53,7 +53,7 @@
g_object_unref(webkitSettings);
}
- webkit_web_view_load_uri(WEBKIT_WEB_VIEW(webView), url);
+ browser_window_load_uri(BROWSER_WINDOW(mainWindow), url);
g_free(url);
gtk_widget_grab_focus(webView);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
