lp:~osomon/oxide/js-dialogs

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~oxide-developers/oxide/oxide.trunk at revision 439

Chris Coulson: Approve on 2014-03-25

Diff: 2167 lines (+1804/-0)

38 files modified

qt/core/browser/oxide_qt_javascript_dialog.cc (+66/-0)
qt/core/browser/oxide_qt_javascript_dialog.h (+57/-0)
qt/core/core.gyp (+4/-0)
qt/core/glue/oxide_qt_javascript_dialog_delegate.cc (+60/-0)
qt/core/glue/oxide_qt_javascript_dialog_delegate.h (+61/-0)
qt/core/glue/oxide_qt_web_view_adapter.h (+4/-0)
qt/core/glue/private/oxide_qt_web_view_adapter_p.cc (+29/-0)
qt/core/glue/private/oxide_qt_web_view_adapter_p.h (+6/-0)
qt/quick/CMakeLists.txt (+5/-0)
qt/quick/api/oxideqquickwebview.cc (+101/-0)
qt/quick/api/oxideqquickwebview_p.h (+21/-0)
qt/quick/api/oxideqquickwebview_p_p.h (+7/-0)
qt/quick/oxide_qquick_alert_dialog_delegate.cc (+65/-0)
qt/quick/oxide_qquick_alert_dialog_delegate.h (+41/-0)
qt/quick/oxide_qquick_before_unload_dialog_delegate.cc (+73/-0)
qt/quick/oxide_qquick_before_unload_dialog_delegate.h (+42/-0)
qt/quick/oxide_qquick_confirm_dialog_delegate.cc (+70/-0)
qt/quick/oxide_qquick_confirm_dialog_delegate.h (+41/-0)
qt/quick/oxide_qquick_javascript_dialog_delegate.cc (+67/-0)
qt/quick/oxide_qquick_javascript_dialog_delegate.h (+54/-0)
qt/quick/oxide_qquick_prompt_dialog_delegate.cc (+109/-0)
qt/quick/oxide_qquick_prompt_dialog_delegate.h (+42/-0)
qt/tests/qmltests/api/tst_WebView_alertDialog.html (+7/-0)
qt/tests/qmltests/api/tst_WebView_alertDialog.qml (+68/-0)
qt/tests/qmltests/api/tst_WebView_beforeUnloadDialog.html (+22/-0)
qt/tests/qmltests/api/tst_WebView_beforeUnloadDialog.qml (+92/-0)
qt/tests/qmltests/api/tst_WebView_beforeUnloadDialog2.html (+4/-0)
qt/tests/qmltests/api/tst_WebView_confirmDialog.html (+12/-0)
qt/tests/qmltests/api/tst_WebView_confirmDialog.qml (+90/-0)
qt/tests/qmltests/api/tst_WebView_promptDialog.html (+16/-0)
qt/tests/qmltests/api/tst_WebView_promptDialog.qml (+105/-0)
shared/browser/oxide_javascript_dialog.cc (+44/-0)
shared/browser/oxide_javascript_dialog.h (+54/-0)
shared/browser/oxide_javascript_dialog_manager.cc (+161/-0)
shared/browser/oxide_javascript_dialog_manager.h (+76/-0)
shared/browser/oxide_web_view.cc (+15/-0)
shared/browser/oxide_web_view.h (+9/-0)
shared/shared.gyp (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1214035: Dialog integration

High

Fix Released

Link a bug report

Related blueprints

315. By Olivier Tilloy on 2014-03-25

Tidy up code for easier maintenance.

314. By Olivier Tilloy on 2014-03-25

Merged the latest changes from trunk, and resolved a conflict.

313. By Olivier Tilloy on 2014-03-24

Merged the latest changes from trunk, and resolved a conflict.

312. By Olivier Tilloy on 2014-03-20

Merged the latest changes from trunk, and resolved a conflict.

311. By Olivier Tilloy on 2014-03-04

Merged the latest changes from trunk, and resolved conflicts.

310. By Olivier Tilloy on 2014-02-21

Merged the latest changes from trunk, and resolved conflicts.

309. By Olivier Tilloy on 2014-02-18

Do the delayed deletion in the JavaScriptDialogManager, to avoid leaving a dangling pointer in the dialog contexts.

308. By Olivier Tilloy on 2014-02-18

Removed unused, commented-out code.

307. By Olivier Tilloy on 2014-02-10

Merged the latest changes from trunk, and resolved a bunch of conflicts.

306. By Olivier Tilloy on 2014-02-02

Cleanup.