\ No newline at end of file
diff --git a/example/notebook/src/LayoutCompositionPolicy.js b/example/notebook/src/LayoutCompositionPolicy.js
deleted file mode 100644
index a690b592d93..00000000000
--- a/example/notebook/src/LayoutCompositionPolicy.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************
- * 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.
- *****************************************************************************/
-
-define(
- [],
- function () {
-
- /**
- * Defines composition policy for Display Layout objects.
- * They cannot contain folders.
- * @constructor
- * @memberof platform/features/layout
- * @implements {Policy.}
- */
- function LayoutCompositionPolicy() {
- }
-
- LayoutCompositionPolicy.prototype.allow = function (parent, child) {
- var parentType = parent.getCapability('type');
- if (parentType.instanceOf('layout') &&
- child.getCapability('type').instanceOf('folder')) {
-
- return false;
- }
-
- return true;
- };
-
- return LayoutCompositionPolicy;
- }
-);
-
diff --git a/example/notebook/src/controllers/notebookController.js b/example/notebook/src/controllers/notebookController.js
index 7e435323340..0161a1b00c3 100644
--- a/example/notebook/src/controllers/notebookController.js
+++ b/example/notebook/src/controllers/notebookController.js
@@ -99,7 +99,7 @@ define(
var delId = $event.currentTarget.parentElement.parentElement.id;
var errorDialog = dialogService.showBlockingMessage({
severity: "error",
- title: "This action will permanently delete this notebook. Do you want to continue?",
+ title: "This action will permanently delete this Notebook entry. Do you want to continue?",
minimized: true, // want the notification to be minimized initially (don't show banner)
options: [{
label: "OK",
@@ -132,7 +132,7 @@ define(
$scope.finished = function(model){
var lastEntry = model[model.length-1];
- if(!lastEntry.text && !lastEntry.embeds){
+ if(!lastEntry.text){
var newEntry = $scope.entriesEl.find('#entry_'+lastEntry.createdOn).addClass('active');
newEntry.find('textarea').focus();
}
@@ -306,14 +306,6 @@ define(
$scope.$on('$destroy', function () {});
-
-
- $scope.selectEntry = function(){
- if (!$scope.selection) {
- $scope.domainObject.getCapability('action').getActions({key:'edit'})[0].perform()
- }
- return true;
- };
}
return notebookController;
diff --git a/example/notebook/src/MCTSnapshot.js b/example/notebook/src/directives/MCTSnapshot.js
similarity index 100%
rename from example/notebook/src/MCTSnapshot.js
rename to example/notebook/src/directives/MCTSnapshot.js
diff --git a/example/notebook/src/entryDnd.js b/example/notebook/src/directives/entryDnd.js
similarity index 100%
rename from example/notebook/src/entryDnd.js
rename to example/notebook/src/directives/entryDnd.js
diff --git a/platform/commonUI/edit/src/creation/CreateWizard.js b/platform/commonUI/edit/src/creation/CreateWizard.js
index f31f97e0eb9..eb17e261f6f 100644
--- a/platform/commonUI/edit/src/creation/CreateWizard.js
+++ b/platform/commonUI/edit/src/creation/CreateWizard.js
@@ -64,7 +64,7 @@ define(
"composition",
parent,
domainObject
- );
+ ) && parent.model.type !== 'notebook';
}
sections.push({