Merge branch 'MDL-44763_preview_int' of https://github.com/andyjdavis…

…/moodle
moodle · Apr 1, 2014 · 814f40b · 814f40b
2 parents d767af7 + 5491fd7
commit 814f40b
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 6 deletions.
diff --git a/lib/editor/atto/plugins/image/lib.php b/lib/editor/atto/plugins/image/lib.php
@@ -48,7 +48,6 @@ function atto_image_strings_for_js() {
         'enteralt',
         'height',
         'presentation',
-        'preview',
         'presentationoraltrequired',
         'width',
     );

diff --git a/...r/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js b/...r/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
@@ -139,7 +139,6 @@ var COMPONENTNAME = 'atto_image',
                 '<br/>' +
 
                 // Add the image preview.
-                '<label for="{{elementid}}_{{CSS.IMAGEPREVIEW}}">{{get_string "preview" component}}</label>' +
                 '<div class="mdl-align">' +
                 '<img src="#" class="{{CSS.IMAGEPREVIEW}}" id="{{elementid}}_{{CSS.IMAGEPREVIEW}}" alt="" style="display: none;"/>' +
                 '<br/>' +

diff --git a/...tor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js b/...tor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js
@@ -139,7 +139,6 @@ var COMPONENTNAME = 'atto_image',
                 '<br/>' +
 
                 // Add the image preview.
-                '<label for="{{elementid}}_{{CSS.IMAGEPREVIEW}}">{{get_string "preview" component}}</label>' +
                 '<div class="mdl-align">' +
                 '<img src="#" class="{{CSS.IMAGEPREVIEW}}" id="{{elementid}}_{{CSS.IMAGEPREVIEW}}" alt="" style="display: none;"/>' +
                 '<br/>' +

diff --git a/lib/editor/atto/plugins/image/yui/src/button/js/button.js b/lib/editor/atto/plugins/image/yui/src/button/js/button.js
@@ -137,7 +137,6 @@ var COMPONENTNAME = 'atto_image',
                 '<br/>' +
 
                 // Add the image preview.
-                '<label for="{{elementid}}_{{CSS.IMAGEPREVIEW}}">{{get_string "preview" component}}</label>' +
                 '<div class="mdl-align">' +
                 '<img src="#" class="{{CSS.IMAGEPREVIEW}}" id="{{elementid}}_{{CSS.IMAGEPREVIEW}}" alt="" style="display: none;"/>' +
                 '<br/>' +