From 46ee2d90fb3bc3901cdc9f6bd0dce60797ebf24d Mon Sep 17 00:00:00 2001 From: Andrew n marshall Date: Wed, 15 Aug 2018 14:42:53 -0700 Subject: [PATCH] Moving media/test_* files (PR #2004) ...to tests/media/. --- tests/blocks/test_blocks.js | 89 +++++++++--------- media/test_200px.png => tests/media/200px.png | Bin media/test_30px.png => tests/media/30px.png | Bin media/test_50px.png => tests/media/50px.png | Bin media/test_a.png => tests/media/a.png | Bin media/test_b.png => tests/media/b.png | Bin media/test_c.png => tests/media/c.png | Bin media/test_d.png => tests/media/d.png | Bin media/test_e.png => tests/media/e.png | Bin media/test_f.png => tests/media/f.png | Bin media/test_g.png => tests/media/g.png | Bin media/test_h.png => tests/media/h.png | Bin media/test_i.png => tests/media/i.png | Bin media/test_j.png => tests/media/j.png | Bin media/test_k.png => tests/media/k.png | Bin media/test_l.png => tests/media/l.png | Bin media/test_m.png => tests/media/m.png | Bin 17 files changed, 45 insertions(+), 44 deletions(-) rename media/test_200px.png => tests/media/200px.png (100%) rename media/test_30px.png => tests/media/30px.png (100%) rename media/test_50px.png => tests/media/50px.png (100%) rename media/test_a.png => tests/media/a.png (100%) rename media/test_b.png => tests/media/b.png (100%) rename media/test_c.png => tests/media/c.png (100%) rename media/test_d.png => tests/media/d.png (100%) rename media/test_e.png => tests/media/e.png (100%) rename media/test_f.png => tests/media/f.png (100%) rename media/test_g.png => tests/media/g.png (100%) rename media/test_h.png => tests/media/h.png (100%) rename media/test_i.png => tests/media/i.png (100%) rename media/test_j.png => tests/media/j.png (100%) rename media/test_k.png => tests/media/k.png (100%) rename media/test_l.png => tests/media/l.png (100%) rename media/test_m.png => tests/media/m.png (100%) diff --git a/tests/blocks/test_blocks.js b/tests/blocks/test_blocks.js index 0630124ac..6c7ecccdc 100644 --- a/tests/blocks/test_blocks.js +++ b/tests/blocks/test_blocks.js @@ -74,22 +74,23 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT "message0": "%1", "args0": [ { + "NOTE": "The following paths are relative to playground.html", "type": "field_dropdown", "name": "FIELDNAME", "options": [ - [{"src": "../media/test_a.png", "width": 32, "height": 32, "alt": "A"}, "A"], - [{"src": "../media/test_b.png", "width": 32, "height": 32, "alt": "B"}, "B"], - [{"src": "../media/test_c.png", "width": 32, "height": 32, "alt": "C"}, "C"], - [{"src": "../media/test_d.png", "width": 32, "height": 32, "alt": "D"}, "D"], - [{"src": "../media/test_e.png", "width": 32, "height": 32, "alt": "E"}, "E"], - [{"src": "../media/test_f.png", "width": 32, "height": 32, "alt": "F"}, "F"], - [{"src": "../media/test_g.png", "width": 32, "height": 32, "alt": "G"}, "G"], - [{"src": "../media/test_h.png", "width": 32, "height": 32, "alt": "H"}, "H"], - [{"src": "../media/test_i.png", "width": 32, "height": 32, "alt": "I"}, "I"], - [{"src": "../media/test_j.png", "width": 32, "height": 32, "alt": "J"}, "J"], - [{"src": "../media/test_k.png", "width": 32, "height": 32, "alt": "K"}, "K"], - [{"src": "../media/test_l.png", "width": 32, "height": 32, "alt": "L"}, "L"], - [{"src": "../media/test_m.png", "width": 32, "height": 32, "alt": "M"}, "M"] + [{"src": "media/a.png", "width": 32, "height": 32, "alt": "A"}, "A"], + [{"src": "media/b.png", "width": 32, "height": 32, "alt": "B"}, "B"], + [{"src": "media/c.png", "width": 32, "height": 32, "alt": "C"}, "C"], + [{"src": "media/d.png", "width": 32, "height": 32, "alt": "D"}, "D"], + [{"src": "media/e.png", "width": 32, "height": 32, "alt": "E"}, "E"], + [{"src": "media/f.png", "width": 32, "height": 32, "alt": "F"}, "F"], + [{"src": "media/g.png", "width": 32, "height": 32, "alt": "G"}, "G"], + [{"src": "media/h.png", "width": 32, "height": 32, "alt": "H"}, "H"], + [{"src": "media/i.png", "width": 32, "height": 32, "alt": "I"}, "I"], + [{"src": "media/j.png", "width": 32, "height": 32, "alt": "J"}, "J"], + [{"src": "media/k.png", "width": 32, "height": 32, "alt": "K"}, "K"], + [{"src": "media/l.png", "width": 32, "height": 32, "alt": "L"}, "L"], + [{"src": "media/m.png", "width": 32, "height": 32, "alt": "M"}, "M"] ] } ] @@ -103,20 +104,20 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT "name": "FIELDNAME", "options": [ ["images and text", "IMAGES AND TEXT"], - [{"src": "../media/test_a.png", "width": 32, "height": 32, "alt": "A"}, "A"], - [{"src": "../media/test_b.png", "width": 32, "height": 32, "alt": "B"}, "B"], - [{"src": "../media/test_c.png", "width": 32, "height": 32, "alt": "C"}, "C"], - [{"src": "../media/test_d.png", "width": 32, "height": 32, "alt": "D"}, "D"], - [{"src": "../media/test_e.png", "width": 32, "height": 32, "alt": "E"}, "E"], - [{"src": "../media/test_f.png", "width": 32, "height": 32, "alt": "F"}, "F"], - [{"src": "../media/test_g.png", "width": 32, "height": 32, "alt": "G"}, "G"], - [{"src": "../media/test_h.png", "width": 32, "height": 32, "alt": "H"}, "H"], + [{"src": "media/a.png", "width": 32, "height": 32, "alt": "A"}, "A"], + [{"src": "media/b.png", "width": 32, "height": 32, "alt": "B"}, "B"], + [{"src": "media/c.png", "width": 32, "height": 32, "alt": "C"}, "C"], + [{"src": "media/d.png", "width": 32, "height": 32, "alt": "D"}, "D"], + [{"src": "media/e.png", "width": 32, "height": 32, "alt": "E"}, "E"], + [{"src": "media/f.png", "width": 32, "height": 32, "alt": "F"}, "F"], + [{"src": "media/g.png", "width": 32, "height": 32, "alt": "G"}, "G"], + [{"src": "media/h.png", "width": 32, "height": 32, "alt": "H"}, "H"], ["xyz", "LMNOP"], - [{"src": "../media/test_i.png", "width": 32, "height": 32, "alt": "I"}, "I"], - [{"src": "../media/test_j.png", "width": 32, "height": 32, "alt": "J"}, "J"], - [{"src": "../media/test_k.png", "width": 32, "height": 32, "alt": "K"}, "K"], - [{"src": "../media/test_l.png", "width": 32, "height": 32, "alt": "L"}, "L"], - [{"src": "../media/test_m.png", "width": 32, "height": 32, "alt": "M"}, "M"] + [{"src": "media/i.png", "width": 32, "height": 32, "alt": "I"}, "I"], + [{"src": "media/j.png", "width": 32, "height": 32, "alt": "J"}, "J"], + [{"src": "media/k.png", "width": 32, "height": 32, "alt": "K"}, "K"], + [{"src": "media/l.png", "width": 32, "height": 32, "alt": "L"}, "L"], + [{"src": "media/m.png", "width": 32, "height": 32, "alt": "M"}, "M"] ] } ] @@ -234,7 +235,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT "args0": [ { "type": "field_image", - "src": "../media/test_30px.png", + "src": "media/30px.png", "width": 50, "height": 50, "alt": "*" @@ -248,7 +249,7 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT "args0": [ { "type": "field_image", - "src": "../media/test_200px.png", + "src": "media/200px.png", "width": 50, "height": 50, "alt": "*" @@ -279,56 +280,56 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_a.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/a.png", "width": 32, "height": 32, "alt": "A" }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_b.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/b.png", "width": 32, "height": 32, "alt": "B" }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_c.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/c.png", "width": 32, "height": 32, "alt": "C" }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_d.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/d.png", "width": 32, "height": 32, "alt": "D" }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_e.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/e.png", "width": 32, "height": 32, "alt": "E" }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_f.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/f.png", "width": 32, "height": 32, "alt": "F" }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_g.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/g.png", "width": 32, "height": 32, "alt": "G" }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_h.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/h.png", "width": 32, "height": 32, "alt": "H" @@ -338,56 +339,56 @@ Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_a.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/a.png", "width": 32, "height": 32, "alt": "A" }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_b.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/b.png", "width": 32, "height": 32, "alt": "B" }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_c.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/c.png", "width": 32, "height": 32, "alt": "C" }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_d.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/d.png", "width": 32, "height": 32, "alt": "D" }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_e.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/e.png", "width": 32, "height": 32, "alt": "E" }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_f.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/f.png", "width": 32, "height": 32, "alt": "F" }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_g.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/g.png", "width": 32, "height": 32, "alt": "G" }, { "type": "field_image", - "src": "https://blockly-demo.appspot.com/static/media/test_h.png", + "src": "https://blockly-demo.appspot.com/static/tests/media/h.png", "width": 32, "height": 32, "alt": "H" diff --git a/media/test_200px.png b/tests/media/200px.png similarity index 100% rename from media/test_200px.png rename to tests/media/200px.png diff --git a/media/test_30px.png b/tests/media/30px.png similarity index 100% rename from media/test_30px.png rename to tests/media/30px.png diff --git a/media/test_50px.png b/tests/media/50px.png similarity index 100% rename from media/test_50px.png rename to tests/media/50px.png diff --git a/media/test_a.png b/tests/media/a.png similarity index 100% rename from media/test_a.png rename to tests/media/a.png diff --git a/media/test_b.png b/tests/media/b.png similarity index 100% rename from media/test_b.png rename to tests/media/b.png diff --git a/media/test_c.png b/tests/media/c.png similarity index 100% rename from media/test_c.png rename to tests/media/c.png diff --git a/media/test_d.png b/tests/media/d.png similarity index 100% rename from media/test_d.png rename to tests/media/d.png diff --git a/media/test_e.png b/tests/media/e.png similarity index 100% rename from media/test_e.png rename to tests/media/e.png diff --git a/media/test_f.png b/tests/media/f.png similarity index 100% rename from media/test_f.png rename to tests/media/f.png diff --git a/media/test_g.png b/tests/media/g.png similarity index 100% rename from media/test_g.png rename to tests/media/g.png diff --git a/media/test_h.png b/tests/media/h.png similarity index 100% rename from media/test_h.png rename to tests/media/h.png diff --git a/media/test_i.png b/tests/media/i.png similarity index 100% rename from media/test_i.png rename to tests/media/i.png diff --git a/media/test_j.png b/tests/media/j.png similarity index 100% rename from media/test_j.png rename to tests/media/j.png diff --git a/media/test_k.png b/tests/media/k.png similarity index 100% rename from media/test_k.png rename to tests/media/k.png diff --git a/media/test_l.png b/tests/media/l.png similarity index 100% rename from media/test_l.png rename to tests/media/l.png diff --git a/media/test_m.png b/tests/media/m.png similarity index 100% rename from media/test_m.png rename to tests/media/m.png