Merge pull request #5746 from adobe/rlim/hints-issue-5740

JeffryBooher · JeffryBooher · commit ecc9ab391e16 · 2013-10-29T13:35:59.000-07:00
Check filename header clicks in the right context.
diff --git a/src/editor/MultiRangeInlineEditor.js b/src/editor/MultiRangeInlineEditor.js
@@ -506,7 +506,8 @@ define(function (require, exports, module) {
         }
         
         // Ignore clicks in editor and clicks on filename link
-        if (!containsClick($(editorRoot)) && !containsClick($(".filename", this.$editorHolder))) {
+        // Check clicks on filename link in the context of the current inline widget.
+        if (!containsClick($(editorRoot)) && !containsClick($(".filename", this.$htmlContent))) {
             childEditor.focus();
             // Only set the cursor if the click isn't in the range list.
             if (!containsClick(this.$relatedContainer)) {

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,8 @@ define(function (require, exports, module) {`
`506`	`506`	`}`
`507`	`507`
`508`	`508`	`// Ignore clicks in editor and clicks on filename link`
`509`		`- if (!containsClick($(editorRoot)) && !containsClick($(".filename", this.$editorHolder))) {`
	`509`	`+ // Check clicks on filename link in the context of the current inline widget.`
	`510`	`+ if (!containsClick($(editorRoot)) && !containsClick($(".filename", this.$htmlContent))) {`
`510`	`511`	`childEditor.focus();`
`511`	`512`	`// Only set the cursor if the click isn't in the range list.`
`512`	`513`	`if (!containsClick(this.$relatedContainer)) {`