Commit 512c87a7 authored by jan.koester's avatar jan.koester
Browse files

test

parent 58732657

editor/html/js/media-browser.js

+6 −5
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ var MediaBrowser = (function() { 


        EditorApi.mediaListMedia(connId, albumId).then(function(resp) {

            var media = resp.media || [];

            var baseUrl = resp.blogUrl || '';

            _status.textContent = '';

            _grid.innerHTML = '';
@@ -119,7 +120,7 @@ var MediaBrowser = (function() { 
            }



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

                _grid.appendChild(_createMediaItem(media[i], connId));

                _grid.appendChild(_createMediaItem(media[i], connId, baseUrl));

            }

        }).catch(function(err) {

            _status.textContent = 'Error: ' + (err.error || 'Unknown');
@@ -127,7 +128,7 @@ var MediaBrowser = (function() { 
        });

    }



    function _createMediaItem(item, connId) {

    function _createMediaItem(item, connId, baseUrl) {

        var div = document.createElement('div');

        div.className = 'media-grid-item';

        div.dataset.id = item.id;
@@ -139,12 +140,12 @@ var MediaBrowser = (function() { 
            // Create preview with width=150, height auto-calculated

            EditorApi.mediaCreatePreview(connId, item.id, 150, 0).then(function(prev) {

                if (prev.url) {

                    img.src = prev.url;

                    img.src = (prev.blogUrl || baseUrl) + prev.url;

                } else {

                    img.src = item.url;

                    img.src = baseUrl + item.url;

                }

            }).catch(function() {

                img.src = item.url;

                img.src = baseUrl + item.url;

            });

            div.appendChild(img);

        } else {

editor/src/webedit_api.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1993,6 +1993,7 @@ void webedit::Api::handleMediaBrowse(libhttppp::HttpRequest &curreq, 
        json_object_put(apiResp);



        json_object_object_add(result, "status", json_object_new_string("ok"));

        json_object_object_add(result, "blogUrl", json_object_new_string(blogUrl.c_str()));

        sendJson(curreq, result);

        json_object_put(result);