Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(462)

Side by Side Diff: Source/WebCore/inspector/front-end/inspector.js

Issue 12223108: Merge 141890 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com). 3 * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
4 * Copyright (C) 2009 Joseph Pecoraro 4 * Copyright (C) 2009 Joseph Pecoraro
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 if (this._isClosing) 558 if (this._isClosing)
559 return; 559 return;
560 this._isClosing = true; 560 this._isClosing = true;
561 this.notifications.dispatchEventToListeners(WebInspector.Events.InspectorClo sing); 561 this.notifications.dispatchEventToListeners(WebInspector.Events.InspectorClo sing);
562 InspectorFrontendHost.closeWindow(); 562 InspectorFrontendHost.closeWindow();
563 } 563 }
564 564
565 WebInspector.documentClick = function(event) 565 WebInspector.documentClick = function(event)
566 { 566 {
567 var anchor = event.target.enclosingNodeOrSelfWithNodeName("a"); 567 var anchor = event.target.enclosingNodeOrSelfWithNodeName("a");
568 if (!anchor || anchor.target === "_blank") 568 if (!anchor || (anchor.target === "_blank" && !WebInspector.ProfileURLRegExp .exec(anchor.href)))
569 return; 569 return;
570 570
571 // Prevent the link from navigating, since we don't do any navigation by fol lowing links normally. 571 // Prevent the link from navigating, since we don't do any navigation by fol lowing links normally.
572 event.consume(true); 572 event.consume(true);
573 573
574 function followLink() 574 function followLink()
575 { 575 {
576 if (WebInspector.isBeingEdited(event.target) || WebInspector._showAnchor Location(anchor)) 576 if (WebInspector.isBeingEdited(event.target) || WebInspector._showAnchor Location(anchor))
577 return; 577 return;
578 578
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
986 doc.addEventListener("contextmenu", this.contextMenuEventFired.bind(this), t rue); 986 doc.addEventListener("contextmenu", this.contextMenuEventFired.bind(this), t rue);
987 doc.addEventListener("click", this.documentClick.bind(this), true); 987 doc.addEventListener("click", this.documentClick.bind(this), true);
988 } 988 }
989 989
990 WebInspector.ProfileURLRegExp = /webkit-profile:\/\/(.+)\/(.+)#([0-9]+)/; 990 WebInspector.ProfileURLRegExp = /webkit-profile:\/\/(.+)\/(.+)#([0-9]+)/;
991 991
992 WebInspector.Zoom = { 992 WebInspector.Zoom = {
993 Table: [0.25, 0.33, 0.5, 0.66, 0.75, 0.9, 1, 1.1, 1.25, 1.5, 1.75, 2, 2.5, 3 , 4, 5], 993 Table: [0.25, 0.33, 0.5, 0.66, 0.75, 0.9, 1, 1.1, 1.25, 1.5, 1.75, 2, 2.5, 3 , 4, 5],
994 DefaultOffset: 6 994 DefaultOffset: 6
995 } 995 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698