Commit d4bd80f0 authored by jan.koester's avatar jan.koester
Browse files

test

parent f40b3d54

editor/html/js/media-browser.js

+6 −2
Original line number Diff line number Diff line
@@ -81,9 +81,13 @@ var MediaBrowser = (function() { 
    function _loadAlbums(connId) {

        _albumSelect.innerHTML = '<option value="">...</option>';

        _grid.innerHTML = '';

        _status.textContent = '';

        _status.textContent = 'Verbinde...';



        EditorApi.mediaListAlbums(connId).then(function(resp) {

        // Auto-connect before browsing media

        EditorApi.connectToConnection(connId).then(function() {

            _status.textContent = '';

            return EditorApi.mediaListAlbums(connId);

        }).then(function(resp) {

            var albums = resp.albums || [];

            _albumSelect.innerHTML = '<option value="">-- Album --</option>';

            for (var i = 0; i < albums.length; i++) {

editor/widgets/image/image.cpp

+5 −0
Original line number Diff line number Diff line
@@ -405,6 +405,11 @@ extern "C" { 
                    if (val) customCss = val;

                }



                // Auto-derive src from media_id when set

                if (!mediaId.empty()) {

                    src = "/media/getimage/" + mediaId + "." + mediaExt;

                }



                json_object_put(obj);

            }

editor/widgets/video/video.cpp

+5 −0
Original line number Diff line number Diff line
@@ -343,6 +343,11 @@ extern "C" { 
                    if (val) customCss = val;

                }



                // Auto-derive src from media_id when set

                if (!mediaId.empty()) {

                    src = "/media/getimage/" + mediaId + "." + mediaExt;

                }



                json_object_put(obj);

            }