chrome/browser/resources/file_manager/js/image_editor/standalone_test.html - Issue 7453045: Moved ChromeOS Image Editor into an iframe.

Unified Diff: chrome/browser/resources/file_manager/js/image_editor/standalone_test.html

Issue 7453045: Moved ChromeOS Image Editor into an iframe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed comments Created 9 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/file_manager/js/image_editor/image_util.js ('k') | chrome/browser/resources/file_manager/js/image_editor/standalone_test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/file_manager/js/image_editor/standalone_test.html

diff --git a/chrome/browser/resources/file_manager/js/image_editor/image_editor_test.html b/chrome/browser/resources/file_manager/js/image_editor/standalone_test.html

similarity index 50%

rename from chrome/browser/resources/file_manager/js/image_editor/image_editor_test.html

rename to chrome/browser/resources/file_manager/js/image_editor/standalone_test.html

index 1730171d2f78d8b38ed18c7ec35da14a048514a2..ea9671fc43bef7d52ea98ee10ff34690fffffa96 100644

--- a/chrome/browser/resources/file_manager/js/image_editor/image_editor_test.html

+++ b/chrome/browser/resources/file_manager/js/image_editor/standalone_test.html

@@ -5,34 +5,37 @@

-->

<html>

<head>

- <link rel="stylesheet" type="text/css" href="image_editor.css"/>

+ <script type="text/javascript" src="standalone_test.js"></script>

- <script type="text/javascript" src="image_util.js"></script>

- <script type="text/javascript" src="image_buffer.js"></script>

- <script type="text/javascript" src="image_editor.js"></script>

- <script type="text/javascript" src="image_transform.js"></script>

- <script type="text/javascript" src="image_adjust.js"></script>

- <script type="text/javascript" src="image_encoder.js"></script>

- <script type="text/javascript" src="exif_encoder.js"></script>

+ <style type="text/css">

+ body {

+ margin: 0

+ }

- <script type="text/javascript" src="image_editor_test.js"></script>

+ .editor-frame {

+ width: 100%;

+ height: 100%;

+ border: none;

+ }

- <style type="text/css">

- #debug-output {

+ .debug-output {

position: absolute;

- top: 36px;

- right: 2px;

+ top: 34px;

+ right: 1px;

text-align: right;

}

.debug-buttons {

position: absolute;

- left: 2px;

- bottom: 2px;

+ left: 1px;

+ bottom: 1px;

+ }

+ .debug-buttons span {

+ margin-left: 10px;

}

- #imageUrl {

+ .image-url {

width: 400px;

margin-left: 20px;

}

@@ -50,19 +53,23 @@

</style>

</head>

-<body onload="createEditor();">

- <div id="frame" class="image-editor"></div>

+<body>

+ <iframe class="editor-frame"

+ scrolling="no"

+ src="image_editor.html"

+ onload="load(createTestGrid());">

+ </iframe>

- <span style="margin-left:10px">Sample images:</span>

+ <span>Sample images:</span>

<button onclick="load('images/small.jpg');">Small</button>

<button onclick="load('images/medium.jpg');">Medium</button>

<button onclick="load('images/large.jpg');">Large</button>

- <input type="text" id="imageUrl">

+ <input type="text" class="image-url">

</div>

- <div id="debug-output" class="ghost"></div>

+ <div class="debug-output ghost"></div>

</body>

</html>