Skip to content

Commit 2ccf3f0

Browse files
dedywahyudidedywahyudi
authored
Merge pull request #26 from cristianmusic7/master
NASA review fixes:
2 parents 60168ea + 46d7c11 commit 2ccf3f0

File tree

9 files changed

+98
-95
lines changed

9 files changed

+98
-95
lines changed

‎example/notebook/bundle.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ define([
5454
"text": "Rehek rerspis nis dem re verae remporrunti sintis vendi comnimi ntiusapic teceseque."
5555
}
5656
],
57-
"composition":[]
57+
"composition":[],
58+
"entryTypes":[]
5859
}
5960
}
6061
],
@@ -83,6 +84,8 @@ define([
8384
"dialogService",
8485
"popupService",
8586
"agentService",
87+
"objectService",
88+
"navigationService",
8689
"now",
8790
"actionService",
8891
"$timeout",
@@ -249,12 +252,8 @@ define([
249252
],
250253
"stylesheets": [
251254
{
252-
"stylesheetUrl": "css/notebook-espresso.css",
255+
"stylesheetUrl": "css/notebook.css",
253256
"theme": "espresso"
254-
},
255-
{
256-
"stylesheetUrl": "css/notebook-snow.css",
257-
"theme": "snow"
258257
}
259258
]
260259
}

‎example/notebook/lib/painterro.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/notebook/res/sass/_notebook-base.scss

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,28 @@
301301
margin-top: 10px;
302302
font-size: 14px;
303303
}
304+
.view-info{
305+
float: left;
306+
.embed-icon{
307+
display: inline-block;
308+
}
309+
.embed-title{
310+
display: inline-block;
311+
margin: 0 5px 0 10px;
312+
}
313+
.object-header{
314+
display: inline-block;
315+
}
316+
}
317+
318+
}
319+
320+
.context-available{
321+
outline: none;
322+
}
304323

324+
.menu-element.menu-view{
325+
z-index: 999;
305326
}
306327

307328
.new-notebook-entry{

‎example/notebook/res/sass/notebook-snow.scss

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎example/notebook/res/sass/notebook-espresso.scss renamed to ‎example/notebook/res/sass/notebook.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ $output-bourbon-deprecation-warnings: false;
2626
@import "../../../../platform/commonUI/general/res/sass/mixins";
2727
@import "../../../../platform/commonUI/themes/espresso/res/sass/constants";
2828
@import "../../../../platform/commonUI/themes/espresso/res/sass/mixins";
29-
@import "../../../../platform/commonUI/general/res/sass/glyphs";
30-
@import "../../../../platform/commonUI/general/res/sass/icons";
31-
@import "../../../../platform/commonUI/general/res/sass/search/search";
3229

3330
// Thematic constants
3431
$colorCode: rgba(black, 0.2);

‎example/notebook/res/templates/notebook.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,22 @@
6868
<div class="embeds l-flex-row">
6969
<div class="entry-embedded" ng-repeat="embed in entry.embeds track by $index" id="{{embed.id}}">
7070
<div class="l-flex-row embed" ng-class="{ 'nosnapshot' : !embed.snapshot}">
71-
<div ng-class="embed.cssClass" class="embed-icon" ng-click="viewSnapshot($event,embed.snapshot.src,embed.id,entry.createdOn,this,setObj(embed.type))"></div>
72-
<div class="snap-thumb" ng-if="embed.snapshot" ng-click="viewSnapshot($event,embed.snapshot.src,embed.id,entry.createdOn,this,setObj(embed.type))">
71+
<div ng-class="embed.cssClass" class="embed-icon" ng-click="viewSnapshot($event,embed.snapshot.src,embed.id,entry.createdOn,this,embed)"></div>
72+
<div class="snap-thumb" ng-if="embed.snapshot" ng-click="viewSnapshot($event,embed.snapshot.src,embed.id,entry.createdOn,this,embed)">
7373
<img ng-src="{{embed.snapshot.src}}" src="//:0" alt="{{embed.id}}" >
7474
</div>
7575
<div class="embed-info l-flex-col">
76-
<div class="embed-title">{{embed.name}}
77-
<a href="" class='context-available' ng-click='openMenu($event)'></a>
76+
<div class="embed-title object-header">
77+
<a href="#" ng-click='navigate($event,embed.type)'>{{embed.name}}</a>
78+
<a href="#" class='context-available' ng-click='openMenu($event,embed.type)'></a>
7879
</div>
7980

8081
<div class="hide-menu" ng-show="false">
8182
<div class="menu-element context-menu-wrapper mobile-disable-select">
8283
<div class="menu context-menu">
8384
<ul>
8485
<li ng-repeat="menu in menuEmbed"
85-
ng-click="menu.perform($event,embed.snapshot.src,embed.id,entry.createdOn,this,setObj(embed.type))"
86+
ng-click="menu.perform($event,embed.snapshot.src,embed.id,entry.createdOn,this,embed)"
8687
title="{{menu.getMetadata().description}}"
8788
class="{{menu.getMetadata().cssClass}}"
8889
ng-if="embed.snapshot">
@@ -95,7 +96,7 @@
9596
ng-if="!embed.snapshot">
9697
{{menu.getMetadata().name}}
9798
</li>
98-
<li ng-repeat="menu in menuActions"
99+
<li ng-repeat="menu in embedActions"
99100
ng-click="menu.perform()"
100101
title="{{menu.getMetadata().description}}"
101102
class="{{menu.getMetadata().cssClass}}">

‎example/notebook/src/actions/createSnapshot.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,21 @@ define(
3939

4040

4141
createSnapshot.prototype.perform = function ($event,snapshot,embedId,entryId,$scope) {
42-
42+
var compile = this.$compile;
4343
var model = this.domainObject.model;
4444
var elementPos = model.entries.map(function(x) {return x.createdOn; }).indexOf(entryId)
4545
var entryEmbeds = model.entries[elementPos].embeds;
4646
var embedPos = entryEmbeds.map(function(x) {return x.id; }).indexOf(embedId);
4747
var embedType = entryEmbeds[embedPos].type;
4848

49-
if(entryId >= 0 && embedId >= 0){
50-
$scope.selObj = $scope.entries[embedType];
51-
$scope.entryId = elementPos;
52-
$scope.embedId = embedPos;
53-
var element = this.$compile(SNAPSHOT_TEMPLATE)($scope);
54-
}
55-
49+
$scope.getDomainObj(embedType).then(function(resp){
50+
if(entryId >= 0 && embedId >= 0){
51+
$scope.selObj = resp[embedType];
52+
$scope.entryId = elementPos;
53+
$scope.embedId = embedPos;
54+
var element = compile(SNAPSHOT_TEMPLATE)($scope);
55+
}
56+
});
5657
};
5758

5859
return createSnapshot;

0 commit comments

Comments
 (0)