Permalink
Browse files

Merge branch 'master' into task_DFL_2973_Make_Request_reviewed

  • Loading branch information...
2 parents d56eb74 + 6d79eed commit 35d90d0b59a502f9e78f9c40815fed8f6307b11f Daniel Herzog committed Oct 11, 2012
Showing with 1,073 additions and 865 deletions.
  1. +27 −15 src/build-application/build_application.js
  2. +7 −0 src/build-application/build_overlay_1_0.js
  3. +4 −2 src/build-application/build_window_manager_2_0.js
  4. +3 −0 src/client-en.xml
  5. +124 −105 src/cookie-manager/cookie_manager_data.js
  6. +1 −0 src/ecma-debugger/dominspection/actions.js
  7. +2 −2 src/ecma-debugger/dominspection/domserializer.js
  8. +20 −19 src/ecma-debugger/dominspection/templates.js
  9. +31 −14 src/ecma-debugger/eventlisteners/evlisteners.css
  10. +2 −1 src/ecma-debugger/eventlisteners/evlistenertooltip.js
  11. +15 −9 src/ecma-debugger/helpers.js
  12. +70 −16 src/ecma-debugger/js-source-view.js
  13. +9 −0 src/ecma-debugger/objectinspection.6.0/baseview.js
  14. +48 −50 src/ecma-debugger/objectinspection.6.0/inspectablejsobject.js
  15. +1 −2 src/ecma-debugger/objectinspection.6.0/prettyprinter.js
  16. +17 −22 src/ecma-debugger/objectinspection.6.0/templates.js
  17. +5 −4 src/ecma-debugger/runtimes.js
  18. +12 −11 src/ecma-debugger/stop_at.js
  19. +20 −8 src/ecma-debugger/views.js
  20. +2 −1 src/ecma-debugger/watches/watches.js
  21. +68 −0 src/lib/dict.js
  22. +12 −58 src/lib/elementprototype.js
  23. +1 −1 src/lib/usertracker.js
  24. +9 −3 src/lib/xmlhttprequestprototype.js
  25. +10 −7 src/profiler/profiler_templates.js
  26. +1 −3 src/repl/friendlyprinter.js
  27. +1 −1 src/repl/listunpacker.js
  28. +3 −1 src/repl/repl_view.js
  29. +29 −16 src/scripts/messages.js
  30. +231 −233 src/scripts/spec_links.js
  31. +2 −0 src/shortcutconfig/shortcutconfig.js
  32. +3 −24 src/storage/data-storages.js
  33. +3 −1 src/storage/storage_style.css
  34. +2 −0 src/style/css_inspector_actions.js
  35. +7 −0 src/style/css_suggest_values.js
  36. +3 −0 src/style/stylesheets.js
  37. +53 −68 src/syntaxhighlight/js/syntax.js
  38. +3 −2 src/syntaxhighlight/js/tokenizer.js
  39. BIN src/ui-images/icons/icon_refetch_listeners.png
  40. BIN src/ui-images/icons/icon_reformat.png
  41. +1 −1 src/ui-scripts/Switches.js
  42. +2 −6 src/ui-scripts/actions/actionbroker.js
  43. +2 −0 src/ui-scripts/actions/actionhandlerinterface.js
  44. +3 −1 src/ui-scripts/actions/globalactionhandler.js
  45. +7 −5 src/ui-scripts/actions/keyidentifier.js
  46. +12 −16 src/ui-scripts/containers.js
  47. +29 −7 src/ui-scripts/dialog.js
  48. +1 −1 src/ui-scripts/overlay.js
  49. +1 −1 src/ui-scripts/sortable_table/sortable_table.js
  50. +11 −9 src/ui-scripts/tab.js
  51. +1 −1 src/ui-scripts/tabs.js
  52. +10 −9 src/ui-scripts/tooltip/tooltip.js
  53. +4 −0 src/ui-scripts/tooltip/tooltipcontext.js
  54. +12 −13 src/ui-scripts/view.js
  55. +9 −0 src/ui-strings/ui_strings-en.js
  56. +1 −15 src/ui-style/tabs.css
  57. +12 −11 src/ui-style/ui.css
  58. +31 −12 src/window-manager/window-manager.js
  59. +23 −23 test-scripts/innerHTML/dom_versus_inner_html.html
  60. +7 −7 test-scripts/innerHTML/templates_6_0_test.js
  61. +7 −7 test-scripts/innerHTML/templates_6_0_test_html5.js
  62. +7 −7 test-scripts/selector-matching-performance/test-selectors.js
  63. +16 −11 test-scripts/test-scripts/keyidentifier.html
  64. +3 −3 test-scripts/test-tokenizer/test-tokenizer.html
@@ -86,7 +86,7 @@ window.app.profiles[window.app.profiles.HTTP_PROFILER].is_enabled = false;
window.app.build_application = function(on_services_created, on_services_enabled)
{
-
+ var app_ctx = {messages: window.messages};
var _find_compatible_version = function(version, version_list)
{
var
@@ -147,6 +147,17 @@ window.app.build_application = function(on_services_created, on_services_enabled
builder = null,
numbers = null;
+ window.messages.clear_session_listeners();
+
+ var session_ctx =
+ {
+ messages: app_ctx.messages,
+ helpers: app_ctx.helpers,
+ tag_manager: app_ctx.tag_manager,
+ show_dragonfly_window: app_ctx.show_dragonfly_window,
+ services: app_ctx.services
+ };
+
for (service_name in service_descriptions)
{
service = service_descriptions[service_name];
@@ -166,7 +177,10 @@ window.app.build_application = function(on_services_created, on_services_enabled
// service_description is a dict of services
// with name and version for each service
// return false if the service shall not be enabled
- window.services[service_name].is_implemented = builder(service, service_descriptions);
+ var is_implemented = builder(service,
+ service_descriptions,
+ session_ctx);
+ window.services[service_name].is_implemented = is_implemented;
}
}
}
@@ -221,14 +235,15 @@ window.app.build_application = function(on_services_created, on_services_enabled
new cls.ServiceBase();
new ActionBroker();
- window.messages.addListener("application-setup", report_usage);
+ window.messages.addListener("application-setup", report_usage, true);
// global objects
- window.tagManager = window.tag_manager = new window.cls.TagManager();
- window.helpers = new cls.Helpers();
+ window.tagManager = window.tag_manager = app_ctx.tag_manager = new window.cls.TagManager();
+ window.helpers = app_ctx.helpers = new cls.Helpers();
// create window.services namespace and register it.
- cls.ServiceBase.register_services(new cls.Namespace("services"));
+ app_ctx.services = new cls.Namespace("services");
+ cls.ServiceBase.register_services(app_ctx.services);
[
'scope',
'console-logger',
@@ -246,6 +261,7 @@ window.app.build_application = function(on_services_created, on_services_enabled
{
cls.debug.create_debug_environment(params);
}
+ app_ctx.show_dragonfly_window = Boolean(params.showdfl);
var namespace = cls.Scope && cls.Scope["1.1"];
namespace.Service.apply(window.services.scope.constructor.prototype);
window.services.scope.is_implemented = true;
@@ -321,18 +337,14 @@ window.app.helpers.parse_url_arguments = function()
supported arguments:
- debug
- log-filter
+ - showdfl
*/
- var
- args = location.search.slice(1).split(';'),
- params = {},
- arg = '',
- i = 0;
-
- for( ; arg = args[i]; i++)
+ var args = location.search.slice(1).split(/[;&]/);
+ var params = {};
+ for (var i = 0, arg; arg = args[i]; i++)
{
arg = arg.split('=');
- params[arg[0].replace(/^ +/, '').replace(/ +$/, '')] =
- arg[1] && arg[1].replace(/^ +/, '').replace(/ +$/, '') || true;
+ params[arg[0].trim()] = arg[1] && arg[1].trim() || true;
}
return params;
}
@@ -0,0 +1,7 @@
+window.app.builders.Overlay || ( window.app.builders.Overlay = {} );
+
+window.app.builders.Overlay["1.0"] = function(service)
+{
+ return true;
+};
+
@@ -4,13 +4,15 @@ window.app.builders.WindowManager || ( window.app.builders.WindowManager = {} );
/**
* @param {Object} service the service description of the according service on the host side
*/
-window.app.builders.WindowManager["2.0"] = function(service)
+window.app.builders.WindowManager["2.0"] = function(service,
+ service_descriptions,
+ session_ctx)
{
var namespace = cls.WindowManager && cls.WindowManager["2.0"];
var service_interface = window.services['window-manager'];
if(service_interface)
{
- window.window_manager_data = new namespace.WindowManagerData();
+ window.window_manager_data = new namespace.WindowManagerData(session_ctx);
window.window_manager_data.bind(service_interface);
window.windowsDropDown = new namespace.WindowsDropDown();
namespace.DebuggerMenu.prototype = new CstSelectWithAction();
View
@@ -22,6 +22,7 @@
inset 0 0 0 2px rgba(255, 255, 255, 0.55);
vertical-align: middle;
-o-transition: background-color 0.2s;
+ transition: background-color 0.2s;
}
.ui-button:not([disabled]):active
@@ -225,6 +226,7 @@ window.load_screen_timeout = window.setTimeout(function()
<script src="./lib/stylesheetlistprototype.js"/>
<script src="./lib/xmlhttprequestprototype.js"/>
<script src="./lib/storageprototype.js"/>
+<script src="./lib/dict.js"/>
<script src="./scripts/Timeouts.js"/>
@@ -347,6 +349,7 @@ window.load_screen_timeout = window.setTimeout(function()
<script src="./build-application/build_resource_manager_1_0.js"></script>
<script src="./build-application/build_profiler_1_0.js"></script>
<script src="./build-application/build_document_manager_1_0.js"></script>
+<script src="./build-application/build_overlay_1_0.js"></script>
<script src="./debug/debug.js"/>
<script src="./debug/po_tester.js"/>
Oops, something went wrong.

0 comments on commit 35d90d0

Please sign in to comment.