nitweb: frontend load full mdoc

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/share/nitweb/javascripts/entities.js b/share/nitweb/javascripts/entities.js
index d5dd3ef..2958f58 100644 (file)
--- a/share/nitweb/javascripts/entities.js
+++ b/share/nitweb/javascripts/entities.js
@@ -53,8 +53,19 @@
                                .state('doc.entity.doc', {
                                        url: '',
                                        templateUrl: 'views/doc/doc.html',
-                                       controller: function(mentity) {
+                                       resolve: {
+                                               doc: function(Model, $q, $stateParams, $state) {
+                                                       var d = $q.defer();
+                                                       Model.loadEntityDoc($stateParams.id, d.resolve,
+                                                               function() {
+                                                                       $state.go('404', null, { location: false })
+                                                               });
+                                                       return d.promise;
+                                               }
+                                       },
+                                       controller: function(mentity, doc) {
                                                this.mentity = mentity;
+                                               this.doc = doc;
                                        },
                                        controllerAs: 'vm',
                                })
@@ -186,6 +197,12 @@
                                                .error(cbErr);
                                },
 
+                               loadEntityDoc: function(id, cb, cbErr) {
+                                       $http.get('/api/entity/' + id + '/doc')
+                                               .success(cb)
+                                               .error(cbErr);
+                               },
+
                                loadEntityLinearization: function(id, cb, cbErr) {
                                        $http.get('/api/linearization/' + id)
                                                .success(cb)

diff --git a/share/nitweb/views/doc/doc.html b/share/nitweb/views/doc/doc.html
index 1cf3c8b..e00f144 100644 (file)
--- a/share/nitweb/views/doc/doc.html
+++ b/share/nitweb/views/doc/doc.html
@@ -3,7 +3,16 @@
                <ui-summary target='#summary-content' />
        </div>
        <div class='col-xs-9' id='summary-content'>
-               <entity-card mentity='vm.mentity' default-tab='doc' no-synopsis='true' />
+               <div class='card'>
+                       <div class='card-body'>
+                               <div ng-if='vm.doc'>
+                                       <div ng-bind-html='vm.doc.documentation'></div>
+                               </div>
+                               <div ng-if='!vm.doc'>
+                                       <i class='text-muted'>No documentation for this entity.</i>
+                               </div>
+                       </div>
+               </div>
 
                <entity-list list-title='Groups' list-entities='vm.mentity.mgroups'
                        list-object-filter='{}' />