diff --git a/example/notebook/src/actions/annotateSnapshot.js b/example/notebook/src/actions/annotateSnapshot.js
index dc67a3798fb..705a04fc96a 100644
--- a/example/notebook/src/actions/annotateSnapshot.js
+++ b/example/notebook/src/actions/annotateSnapshot.js
@@ -24,7 +24,7 @@
* Module defining viewSnapshot (Originally NewWindowAction). Created by vwoeltje on 11/18/14.
*/
define(
- ['../../lib/painterro'],
+ ["painterro"],
function () {
var ANNOTATION_STRUCT = {
@@ -42,7 +42,7 @@ define(
}]
};
- function annotateSnapshot(dialogService,dndService,$rootScope,context) {
+ function AnnotateSnapshot(dialogService,dndService,$rootScope,context) {
context = context || {};
// Choose the object to be opened into a new tab
@@ -55,15 +55,14 @@ define(
- annotateSnapshot.prototype.perform = function ($event,snapshot,embedId,entryId,$scope) {
+ AnnotateSnapshot.prototype.perform = function ($event,snapshot,embedId,entryId,$scope) {
- var domainObject = this.domainObject;
+ var DOMAIN_OBJECT = this.domainObject;
+ var ROOTSCOPE = this.$rootScope;
this.dialogService.getUserChoice(ANNOTATION_STRUCT)
.then(saveNotes);
- var rootscope = this.$rootScope;
-
var painterro;
var tracker = function(){
@@ -74,12 +73,12 @@ define(
hiddenTools:['save', 'open', 'close','eraser'],
saveHandler: function (image, done) {
if(entryId && embedId){
- var elementPos = domainObject.model.entries.map(function(x) {return x.createdOn; }).indexOf(entryId)
- var entryEmbeds = domainObject.model.entries[elementPos].embeds;
+ var elementPos = DOMAIN_OBJECT.model.entries.map(function(x) {return x.createdOn; }).indexOf(entryId)
+ var entryEmbeds = DOMAIN_OBJECT.model.entries[elementPos].embeds;
var embedPos = entryEmbeds.map(function(x) {return x.id; }).indexOf(embedId);
$scope.saveSnap(image.asBlob(),embedPos,elementPos);
}else{
- rootscope.snapshot = {'src':image.asDataURL('image/png'),
+ ROOTSCOPE.snapshot = {'src':image.asDataURL('image/png'),
'modified':Date.now()};
}
@@ -97,12 +96,12 @@ define(
if(param=='ok'){
painterro.save();
}else{
- rootscope.snapshot = "annotationCancelled";
+ ROOTSCOPE.snapshot = "annotationCancelled";
}
}
};
- return annotateSnapshot;
+ return AnnotateSnapshot;
}
);
diff --git a/example/notebook/src/actions/createSnapshot.js b/example/notebook/src/actions/createSnapshot.js
index a4a493064e9..e9d4b61e04b 100644
--- a/example/notebook/src/actions/createSnapshot.js
+++ b/example/notebook/src/actions/createSnapshot.js
@@ -30,7 +30,7 @@ define(
'mct-object="selObj">'+
'';
- function createSnapshot($compile,context) {
+ function CreateSnapshot($compile,context) {
context = context || {};
this.domainObject = context.selectedObject || context.domainObject;
this.context = context;
@@ -38,7 +38,7 @@ define(
}
- createSnapshot.prototype.perform = function ($event,snapshot,embedId,entryId,$scope) {
+ CreateSnapshot.prototype.perform = function ($event,snapshot,embedId,entryId,$scope) {
var compile = this.$compile;
var model = this.domainObject.model;
var elementPos = model.entries.map(function(x) {return x.createdOn; }).indexOf(entryId)
@@ -56,6 +56,6 @@ define(
});
};
- return createSnapshot;
+ return CreateSnapshot;
}
);
diff --git a/example/notebook/src/actions/newEntryContextual.js b/example/notebook/src/actions/newEntryContextual.js
index 1aee59756b5..7000840c7fc 100644
--- a/example/notebook/src/actions/newEntryContextual.js
+++ b/example/notebook/src/actions/newEntryContextual.js
@@ -68,7 +68,7 @@ define(
}]
};
- function newEntryContextual($compile,$rootScope,dialogService,notificationService,linkService,context) {
+ function NewEntryContextual($compile,$rootScope,dialogService,notificationService,linkService,context) {
context = context || {};
this.domainObject = context.selectedObject || context.domainObject;
this.dialogService = dialogService;
@@ -83,7 +83,7 @@ define(
}
- newEntryContextual.prototype.perform = function () {
+ NewEntryContextual.prototype.perform = function () {
var self = this;
var domainObj = this.domainObject;
@@ -184,12 +184,12 @@ define(
}
};
- newEntryContextual.appliesTo = function (context) {
+ NewEntryContextual.appliesTo = function (context) {
var domainObject = context.domainObject;
return domainObject && domainObject.hasCapability("notebook") &&
domainObject.getCapability("notebook").isNotebook();
};
- return newEntryContextual;
+ return NewEntryContextual;
}
);
diff --git a/example/notebook/src/actions/removeEmbed.js b/example/notebook/src/actions/removeEmbed.js
index d82ff7eec74..9b331823125 100644
--- a/example/notebook/src/actions/removeEmbed.js
+++ b/example/notebook/src/actions/removeEmbed.js
@@ -24,7 +24,7 @@ define(
[],
function () {
- function removeEmbed(dialogService,context) {
+ function RemoveEmbed(dialogService,context) {
context = context || {};
this.domainObject = context.selectedObject || context.domainObject;
@@ -32,8 +32,8 @@ define(
}
- removeEmbed.prototype.perform = function ($event,snapshot,embedId,entryId) {
- var domainObj = this.domainObject;
+ RemoveEmbed.prototype.perform = function ($event,snapshot,embedId,entryId) {
+ var DOMAIN_OBJ = this.domainObject;
errorDialog = this.dialogService.showBlockingMessage({
severity: "error",
title: "This action will permanently delete this Embed. Do you want to continue?",
@@ -53,17 +53,16 @@ define(
});
function remove(){
- domainObj.useCapability('mutation', function(model) {
+ DOMAIN_OBJ.useCapability('mutation', function(model) {
var elementPos = model.entries.map(function(x) {return x.createdOn; }).indexOf(entryId)
var entryEmbeds = model.entries[elementPos].embeds;
var embedPos = entryEmbeds.map(function(x) {return x.id; }).indexOf(embedId);
model.entries[elementPos].embeds.splice(embedPos,1);
});
-
}
};
- return removeEmbed;
+ return RemoveEmbed;
}
);
diff --git a/example/notebook/src/actions/removeSnapshot.js b/example/notebook/src/actions/removeSnapshot.js
index 8f7e7ac2131..fc709bc1794 100644
--- a/example/notebook/src/actions/removeSnapshot.js
+++ b/example/notebook/src/actions/removeSnapshot.js
@@ -24,7 +24,7 @@ define(
[],
function () {
- function removeSnapshot(dialogService,context) {
+ function RemoveSnapshot(dialogService,context) {
context = context || {};
this.domainObject = context.selectedObject || context.domainObject;
@@ -33,9 +33,9 @@ define(
- removeSnapshot.prototype.perform = function ($event,snapshot,embedId,entryId) {
+ RemoveSnapshot.prototype.perform = function ($event,snapshot,embedId,entryId) {
- var domainObj = this.domainObject;
+ var DOMAIN_OBJ = this.domainObject;
errorDialog = this.dialogService.showBlockingMessage({
severity: "error",
title: "This action will permanently delete this Snapshot. Do you want to continue?",
@@ -55,7 +55,7 @@ define(
});
function remove(){
- domainObj.useCapability('mutation', function(model) {
+ DOMAIN_OBJ.useCapability('mutation', function(model) {
var elementPos = model.entries.map(function(x) {return x.createdOn; }).indexOf(entryId)
var entryEmbeds = model.entries[elementPos].embeds;
var embedPos = entryEmbeds.map(function(x) {return x.id; }).indexOf(embedId);
@@ -65,6 +65,6 @@ define(
};
- return removeSnapshot;
+ return RemoveSnapshot;
}
);
diff --git a/example/notebook/src/actions/viewSnapshot.js b/example/notebook/src/actions/viewSnapshot.js
index b8ae4a7274a..b61b1979cfa 100644
--- a/example/notebook/src/actions/viewSnapshot.js
+++ b/example/notebook/src/actions/viewSnapshot.js
@@ -21,7 +21,7 @@
*****************************************************************************/
/**
- * Module defining viewSnapshot (Originally NewWindowAction). Created by vwoeltje on 11/18/14.
+ * Module defining ViewSnapshot
*/
define(
[],
@@ -40,7 +40,7 @@ define(
'
';
- function viewSnapshot($compile,context) {
+ function ViewSnapshot($compile,context) {
context = context || {};
this.$compile = $compile;
@@ -125,7 +125,7 @@ define(
}
- viewSnapshot.prototype.perform = function($event,snapshot,embedId,entryId,$scope,embed) {
+ ViewSnapshot.prototype.perform = function($event,snapshot,embedId,entryId,$scope,embed) {
var isOpen = false;
// Create the overlay element and add it to the document's body
@@ -155,6 +155,6 @@ define(
toggleOverlay();
};
- return viewSnapshot;
+ return ViewSnapshot;
}
);
diff --git a/example/notebook/src/capabilities/notebookCapability.js b/example/notebook/src/capabilities/notebookCapability.js
index 8668c460807..be0312be5e6 100644
--- a/example/notebook/src/capabilities/notebookCapability.js
+++ b/example/notebook/src/capabilities/notebookCapability.js
@@ -30,7 +30,7 @@ define(
*
* @constructor
*/
- function noteBookCapability(typeService, domainObject) {
+ function NotebookCapability(typeService, domainObject) {
this.domainObject = domainObject;
this.typeService = typeService;
return this;
@@ -41,10 +41,10 @@ define(
*
* @returns {Boolean}
*/
- noteBookCapability.prototype.isNotebook = function () {
- return this.typeService.getType('notebook');;
+ NotebookCapability.prototype.isNotebook = function () {
+ return this.typeService.getType('notebook');
};
- return noteBookCapability;
+ return NotebookCapability;
}
);
diff --git a/example/notebook/src/controllers/LayoutNotebookController.js b/example/notebook/src/controllers/LayoutNotebookController.js
new file mode 100644
index 00000000000..ad36b53715e
--- /dev/null
+++ b/example/notebook/src/controllers/LayoutNotebookController.js
@@ -0,0 +1,54 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * This bundle implements object types and associated views for
+ * display-building.
+ */
+define(
+ [],
+ function () {
+
+ /**
+ * The LayoutNotebookController is responsible for supporting the
+ * notebook feature creation on theLayout view.
+ **/
+
+ function LayoutNotebookController($scope) {
+ $scope.hasNotebookAction = undefined;
+
+ $scope.newNotebook = undefined;
+
+ var actions = $scope.domainObject.getCapability('action');
+ var notebookAction = actions.getActions({'key': 'notebook-new-entry'});
+ if (notebookAction.length > 0) {
+ $scope.hasNotebookAction = true;
+ $scope.newNotebook = function () {
+ notebookAction[0].perform();
+ };
+ }
+ }
+
+ return LayoutNotebookController;
+ }
+);
+
diff --git a/example/notebook/src/controllers/newEntryController.js b/example/notebook/src/controllers/newEntryController.js
index d5d65aae30e..51fc7afff5e 100644
--- a/example/notebook/src/controllers/newEntryController.js
+++ b/example/notebook/src/controllers/newEntryController.js
@@ -21,12 +21,12 @@
*****************************************************************************/
/**
- * Module defining newEntryController. */
+ * Module defining NewEntryController. */
define(
[],
function () {
- function newEntryController($scope,$rootScope) {
+ function NewEntryController($scope,$rootScope) {
$scope.snapshot = undefined;
$scope.snapToggle = true;
@@ -61,6 +61,6 @@ define(
}
}
- return newEntryController;
+ return NewEntryController;
}
);
\ No newline at end of file
diff --git a/example/notebook/src/controllers/notebookController.js b/example/notebook/src/controllers/notebookController.js
index 3a03892b9b2..c4e2398469f 100644
--- a/example/notebook/src/controllers/notebookController.js
+++ b/example/notebook/src/controllers/notebookController.js
@@ -27,7 +27,7 @@ define(
function () {
- function notebookController(
+ function NotebookController(
$scope,
dialogService,
popupService,
@@ -42,13 +42,7 @@ define(
var showAll = true,
showCompleted;
- var self = this;
$scope.entriesEl = $(document.body).find('.entries-list');
-
- $scope.time = now();
-
- $scope.AS = actionService;
-
$scope.sortEntries = '-createdOn';
$scope.showTime = "0";
$scope.editEntry = false;
@@ -59,7 +53,7 @@ define(
/*--seconds in an hour--*/
- $scope.hourSecs = 60 * 60 * 1000;
+ SECONDS_IN_AN_HOUR = 60 * 60 * 1000;
this.scope = $scope;
@@ -74,7 +68,7 @@ define(
$scope.hoursFilter = function(hours,entryTime){
if(+hours){
- return entryTime > (now() - $scope.hourSecs*(+hours));
+ return entryTime > (now() - SECONDS_IN_AN_HOUR *(+hours));
}else{
return true;
}
@@ -91,11 +85,15 @@ define(
var entries = $scope.domainObject.model.entries;
var lastEntry= entries[entries.length-1];
if(lastEntry==undefined || lastEntry.text || lastEntry.embeds){
- $scope.domainObject.model.entries.push({'createdOn':now()});
+ $scope.domainObject.useCapability('mutation', function(model) {
+ model.entries.push({'createdOn':now()});
+ });
+
}else{
- $scope.domainObject.model.entries[entries.length-1].createdOn = now();
- }
- $scope.domainObject.useCapability('mutation', function(model) {});
+ $scope.domainObject.useCapability('mutation', function(model) {
+ model.entries[entries.length-1].createdOn = now();
+ });
+ }
$scope.entrySearch = '';
};
@@ -112,11 +110,13 @@ define(
errorDialog.dismiss();
var elementPos = $scope.domainObject.model.entries.map(function(x) {return x.createdOn; }).indexOf(+delId.replace('entry_',''));
if(elementPos != -1){
- $scope.domainObject.model.entries.splice(elementPos,1);
+ $scope.domainObject.useCapability('mutation', function(model) {
+ model.entries.splice(elementPos,1);
+ });
}else{
console.log('delete error');
}
- $scope.domainObject.useCapability('mutation', function(model) {});
+
}
},{
label: "Cancel",
@@ -136,11 +136,12 @@ define(
$scope.textBlur = function($event,entryId){
if($event.target && $event.target.value !== ""){
var elementPos = $scope.domainObject.model.entries.map(function(x) {return x.createdOn}).indexOf(+(entryId));
- $scope.domainObject.model.entries[elementPos].text = $event.target.value;
- if($scope.currentEntryValue !== $event.target.value){
- $scope.domainObject.model.entries[elementPos].createdOn = now();
- }
- $scope.domainObject.useCapability('mutation', function(model) {});
+ $scope.domainObject.useCapability('mutation', function(model) {
+ model.entries[elementPos].text = $event.target.value;
+ if($scope.currentEntryValue !== $event.target.value){
+ model.entries[elementPos].createdOn = now();
+ }
+ });
}
}
@@ -334,5 +335,5 @@ define(
$scope.$on('$destroy', function () {});
}
- return notebookController;
+ return NotebookController;
});
\ No newline at end of file
diff --git a/example/notebook/src/controllers/selectSnapshotController.js b/example/notebook/src/controllers/selectSnapshotController.js
index 9e24de27eab..a59b158db33 100644
--- a/example/notebook/src/controllers/selectSnapshotController.js
+++ b/example/notebook/src/controllers/selectSnapshotController.js
@@ -21,12 +21,12 @@
*****************************************************************************/
/**
- * Module defining selectSnapshot. */
+ * Module defining SelectSnapshotController. */
define(
[],
function () {
- function selectSnapshot($scope,$rootScope) {
+ function SelectSnapshotController($scope,$rootScope) {
$scope.selectModel = true;
@@ -39,6 +39,6 @@ define(
}
- return selectSnapshot;
+ return SelectSnapshotController;
}
);
\ No newline at end of file
diff --git a/example/notebook/src/directives/MCTModalNotebook.js b/example/notebook/src/directives/MCTModalNotebook.js
new file mode 100644
index 00000000000..8f167d428a3
--- /dev/null
+++ b/example/notebook/src/directives/MCTModalNotebook.js
@@ -0,0 +1,165 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2016, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+ 'zepto'
+], function (
+ $
+) {
+
+ var OVERLAY_TEMPLATE = '' +
+'
' +
+'
';
+
+ var NEW_NOTEBOOK_TEMPLATE = '
' +
+ 'New Notebook Entry' +
+ '';
+
+ /**
+ * MCT Trigger Modal is intended for use in only one location: inside the
+ * object-header to allow views in a layout to be popped out in a modal.
+ * Users can close the modal and go back to normal, and everything generally
+ * just works fine.
+ *
+ * This code is sensitive to how our html is constructed-- particularly with
+ * how it locates the the container of an element in a layout. However, it
+ * should be able to handle slight relocations so long as it is always a
+ * descendent of a `.frame` element.
+ */
+ function MCTModalNotebook($document) {
+ var document = $document[0];
+
+ function link($scope, $element) {
+ var frame = $element.parent();
+
+ for (var i = 0; i < 10; i++) {
+ if (frame.hasClass('frame')) {
+ break;
+ }
+ frame = frame.parent();
+ }
+ if (!frame.hasClass('frame')) {
+ $element.remove();
+ return;
+ }
+
+ frame = frame[0];
+ var layoutContainer = frame.parentElement,
+ isOpen = false,
+ toggleOverlay,
+ overlay,
+ closeButton,
+ doneButton,
+ notebookButton,
+ blocker,
+ overlayContainer,
+ notebookButtonEl;
+
+ function openOverlay() {
+
+ // Remove frame classes from being applied in a non-frame context
+ $(frame).removeClass('frame frame-template');
+ overlay = document.createElement('div');
+ $(overlay).addClass('abs overlay l-large-view');
+ overlay.innerHTML = OVERLAY_TEMPLATE;
+ overlayContainer = overlay.querySelector('.t-contents');
+ closeButton = overlay.querySelector('a.close');
+ closeButton.addEventListener('click', toggleOverlay);
+ doneButton = overlay.querySelector('a.t-done');
+ doneButton.addEventListener('click', toggleOverlay);
+ blocker = overlay.querySelector('.abs.blocker');
+ blocker.addEventListener('click', toggleOverlay);
+ document.body.appendChild(overlay);
+ layoutContainer.removeChild(frame);
+ overlayContainer.appendChild(frame);
+
+ //verify if there is a new notebook entry action
+ var actions = $scope.domainObject.getCapability('action');
+ var notebookAction = actions.getActions({'key': 'notebook-new-entry'});
+ if (notebookAction.length > 0) {
+ notebookButtonEl = document.createElement('div');
+ $(notebookButtonEl).addClass('notebook-button-container');
+ notebookButtonEl.innerHTML = NEW_NOTEBOOK_TEMPLATE;
+ notebookButton = frame.querySelector('.object-browse-bar .left');
+ notebookButton.appendChild(notebookButtonEl);
+ $(frame.querySelector('.object-holder')).addClass('container-notebook');
+ notebookButton.addEventListener('click', function () {
+ notebookAction[0].perform();
+ });
+ }
+
+ }
+
+ function closeOverlay() {
+ $(frame).addClass('frame frame-template');
+ overlayContainer.removeChild(frame);
+ layoutContainer.appendChild(frame);
+ document.body.removeChild(overlay);
+ closeButton.removeEventListener('click', toggleOverlay);
+ closeButton = undefined;
+ doneButton.removeEventListener('click', toggleOverlay);
+ doneButton = undefined;
+ blocker.removeEventListener('click', toggleOverlay);
+ blocker = undefined;
+ overlayContainer = undefined;
+ overlay = undefined;
+
+
+ if (notebookButton) {
+ notebookButton.removeChild(notebookButtonEl);
+ }
+
+ }
+
+ toggleOverlay = function () {
+ if (!isOpen) {
+ openOverlay();
+ isOpen = true;
+ } else {
+ closeOverlay();
+ isOpen = false;
+ }
+ };
+
+ $element.on('click', toggleOverlay);
+ $scope.$on('$destroy', function () {
+ $element.off('click', toggleOverlay);
+ });
+ }
+
+ return {
+ restrict: 'A',
+ link: link
+ };
+ }
+
+ return MCTModalNotebook;
+
+});
diff --git a/example/notebook/src/directives/entryDnd.js b/example/notebook/src/directives/entryDnd.js
index 63f32aa0282..90093ab86e1 100644
--- a/example/notebook/src/directives/entryDnd.js
+++ b/example/notebook/src/directives/entryDnd.js
@@ -30,10 +30,9 @@ define([
'mct-object="selObj">'+
'';
- function entryDnd($rootScope,$compile,dndService,typeService,notificationService) {
+ function EntryDnd($rootScope,$compile,dndService,typeService,notificationService) {
function link($scope, $element) {
- var domainObj = $scope.domainObject;
function drop(e) {
var event = (e || {}).originalEvent || e,
@@ -46,20 +45,23 @@ define([
$scope.clearSearch();
if($element[0].id == 'newEntry'){
- entryId = domainObj.model.entries.length;
+ entryId = $scope.domainObject.model.entries.length;
embedId = 0;
- var lastEntry= domainObj.model.entries[entryId-1];
+ var lastEntry= $scope.domainObject.model.entries[entryId-1];
if(lastEntry==undefined || lastEntry.text || lastEntry.embeds){
- domainObj.model.entries.push({'createdOn':+Date.now(),
- 'embeds':[{'type':selectedObject.getId(),
+ $scope.domainObject.useCapability('mutation', function(model) {
+ model.entries.push({'createdOn':+Date.now(),
+ 'embeds':[{'type':selectedObject.getId(),
'id':''+Date.now(),
'cssClass':cssClass,
'name':selectedModel.name,
'snapshot':''
}]
});
+ });
}else{
- domainObj.model.entries[entryId-1] =
+ $scope.domainObject.useCapability('mutation', function(model) {
+ model.entries[entryId-1] =
{'createdOn':+Date.now(),
'embeds':[{'type':selectedObject.getId(),
'id':''+Date.now(),
@@ -68,6 +70,7 @@ define([
'snapshot':''
}]
};
+ });
}
$scope.scrollToTop();
@@ -77,22 +80,23 @@ define([
}else{
- entryId = domainObj.model.entries.map(function(x) {
+ entryId = $scope.domainObject.model.entries.map(function(x) {
return x.createdOn;
}).indexOf(+($element[0].id.replace('entry_','')));
- if(!domainObj.model.entries[entryId].embeds){
- domainObj.model.entries[entryId].embeds = [];
+ if(!$scope.domainObject.model.entries[entryId].embeds){
+ $scope.domainObject.model.entries[entryId].embeds = [];
}
-
- domainObj.model.entries[entryId].embeds.push({'type':selectedObject.getId(),
- 'id':''+Date.now(),
- 'cssClass':cssClass,
- 'name':selectedModel.name,
- 'snapshot':''
- });
-
- embedId = domainObj.model.entries[entryId].embeds.length-1;
+ $scope.domainObject.useCapability('mutation', function(model) {
+ model.entries[entryId].embeds.push({'type':selectedObject.getId(),
+ 'id':''+Date.now(),
+ 'cssClass':cssClass,
+ 'name':selectedModel.name,
+ 'snapshot':''
+ });
+ });
+
+ embedId = $scope.domainObject.model.entries[entryId].embeds.length-1;
if (selectedObject) {
e.preventDefault();
@@ -125,7 +129,8 @@ define([
$scope.$on('$destroy', function () {
-
+ $element.off('dragover', dragover);
+ $element.off('drop', drop);
});
}
@@ -135,6 +140,6 @@ define([
};
}
- return entryDnd;
+ return EntryDnd;
});
diff --git a/example/notebook/src/policies/CompositionPolicy.js b/example/notebook/src/policies/CompositionPolicy.js
new file mode 100644
index 00000000000..782a02e07f0
--- /dev/null
+++ b/example/notebook/src/policies/CompositionPolicy.js
@@ -0,0 +1,44 @@
+/******************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * This bundle implements "containment" rules, which determine which objects
+ * can be contained within a notebook.
+ */
+define(
+ [],
+ function () {
+ function CompositionPolicy() {
+ }
+
+ CompositionPolicy.prototype.allow = function (parent, child) {
+ var parentDef = parent.getCapability('type').getName();
+
+ if(parentDef === 'Notebook' && child.getCapability('status').list().length){
+ return false;
+ }
+ return true;
+ };
+
+ return CompositionPolicy;
+ }
+);
diff --git a/example/notebook/src/indicators/notificationIndicator.js b/example/notebook/src/policies/ViewPolicy.js
similarity index 61%
rename from example/notebook/src/indicators/notificationIndicator.js
rename to example/notebook/src/policies/ViewPolicy.js
index 9d45399388a..290686582e6 100644
--- a/example/notebook/src/indicators/notificationIndicator.js
+++ b/example/notebook/src/policies/ViewPolicy.js
@@ -19,36 +19,22 @@
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
-/*global define,window*/
define(
- [],
function () {
- "use strict";
-
- /**
- * A tool for manually invoking notifications. When included this
- * indicator will allow for notifications of different types to be
- * launched for demonstration and testing purposes.
- * @constructor
- */
-
- function NotificationIndicator() {
-
+
+ function ViewPolicy() {
}
- NotificationIndicator.template = 'notificationTemplate';
+ ViewPolicy.prototype.allow = function (view, domainObject) {
+ if(view.key === 'layout'){
+ return false;
+ }
- NotificationIndicator.prototype.getGlyphClass = function () {
- return 'ok';
- };
- NotificationIndicator.prototype.getText = function () {
- return "Launch notification";
- };
- NotificationIndicator.prototype.getDescription = function () {
- return "Launch notification";
+ return true;
};
- return NotificationIndicator;
+ return ViewPolicy;
}
);
+
diff --git a/openmct.js b/openmct.js
index b2f20048911..c87239faa9e 100644
--- a/openmct.js
+++ b/openmct.js
@@ -48,7 +48,8 @@ requirejs.config({
"d3-format": "node_modules/d3-format/build/d3-format.min",
"d3-interpolate": "node_modules/d3-interpolate/build/d3-interpolate.min",
"d3-time": "node_modules/d3-time/build/d3-time.min",
- "d3-time-format": "node_modules/d3-time-format/build/d3-time-format.min"
+ "d3-time-format": "node_modules/d3-time-format/build/d3-time-format.min",
+ "painterro": "node_modules/@cristian77/painterro/build/painterro.min"
},
"shim": {
"angular": {
@@ -66,6 +67,9 @@ requirejs.config({
"moment-duration-format": {
"deps": ["moment"]
},
+ "painterro": {
+ "exports": "painterro"
+ },
"screenfull": {
"exports": "screenfull"
},
diff --git a/package.json b/package.json
index 35f2a422616..16e4fede0c0 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,9 @@
{
"name": "openmct",
"version": "0.12.1-SNAPSHOT",
- "description": "The Open MCT core platform",
+ "description": "The Open MCT core platform -- notebook",
"dependencies": {
+ "@cristian77/painterro": "^0.2.48",
"d3-array": "^1.0.2",
"d3-axis": "^1.0.4",
"d3-collection": "^1.0.2",
@@ -14,6 +15,7 @@
"d3-time": "^1.0.4",
"d3-time-format": "^2.0.3",
"express": "^4.13.1",
+ "jasmine-core": "^2.5.2",
"minimist": "^1.1.1",
"request": "^2.69.0"
},
diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html
index 06ffd9aa83d..de03573bd92 100644
--- a/platform/commonUI/browse/res/templates/browse.html
+++ b/platform/commonUI/browse/res/templates/browse.html
@@ -44,7 +44,7 @@
ng-model="treeModel"
class="holder flex-elem grows vscroll tree-holder"
ng-hide="treeModel.search">
-
+