From 31f315a46d650bbfde1999d8427086e239edcc8f Mon Sep 17 00:00:00 2001 From: FoxUSA Date: Mon, 9 May 2016 00:08:38 -0700 Subject: [PATCH] #149 Copy and paste code. Updated dependencies --- .jshintrc | 2 +- Gruntfile.js | 2 +- OpenNote/.project | 23 ------- OpenNote/bower.json | 21 +++--- OpenNote/index.html | 2 - .../openNote/controllers/folderController.js | 24 ++++++- .../openNote/controllers/listController.js | 65 ++++++++++++------- .../openNote/controllers/noteController.js | 55 +++++++++++----- OpenNote/openNote/openNote.config.js | 2 +- OpenNote/openNote/openNote.js | 3 +- OpenNote/openNote/partials/folderPartial.html | 8 ++- 11 files changed, 120 insertions(+), 87 deletions(-) delete mode 100644 OpenNote/.project diff --git a/.jshintrc b/.jshintrc index 49260ba..0610a72 100644 --- a/.jshintrc +++ b/.jshintrc @@ -8,6 +8,6 @@ "devel":true, "jquery":true, "jasmine": true, - "predef": [ "injector","angular","alertify","", "PouchDB", "CKEDITOR","inject" ], + "predef": [ "angular","alertify","", "PouchDB", "CKEDITOR","inject" ], "globals":{"openNote":true} } diff --git a/Gruntfile.js b/Gruntfile.js index 6fb64ed..eb13854 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -170,7 +170,7 @@ module.exports = function(grunt) { // you can run individual command using the plug-in command syntax suck as manifest:generate or shell:clean grunt.registerTask("build", ["shell:bowerInstall", "buildDevCSS", "manifest:generate"]); grunt.registerTask("default", ["build"]); - grunt.registerTask("deploy", ["shell:clean", "shell:bowerInstall", "buildProdCSS", "manifest:generate", "shell:phpPackage"]); + grunt.registerTask("deploy", ["shell:clean", "shell:bowerInstall", "buildProdCSS", "manifest:generate"]); //testing grunt.registerTask("devmode", ["karma:unit", "watch"]); diff --git a/OpenNote/.project b/OpenNote/.project deleted file mode 100644 index 1b1fade..0000000 --- a/OpenNote/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - OpenNote - - - - - - com.aptana.editor.php.aptanaPhpBuilder - - - - - com.aptana.ide.core.unifiedBuilder - - - - - - com.aptana.editor.php.phpNature - com.aptana.projects.webnature - - diff --git a/OpenNote/bower.json b/OpenNote/bower.json index 758c5ad..cca4cf7 100644 --- a/OpenNote/bower.json +++ b/OpenNote/bower.json @@ -7,18 +7,17 @@ "version": "15.07.0", "dependencies": { "jquery": "2.1.4", - "bootstrap": "3.3.4", - "angular": "1.3.15", - "angular-route": "1.3.15", - "angular-resource": "1.3.15", - "angular-sanitize": "1.3.15", - "angular-animate": "1.3.15", - "angular-mocks": "1.3.15", - "ckeditor": "ckeditor/ckeditor-releases#full/4.4.x", - "angular-ui-tree": "2.4.0", + "bootstrap": "^3.3.6", + "angular": "^1.5.5", + "angular-route": "^1.5.5", + "angular-resource": "^1.5.5", + "angular-sanitize": "^1.5.5", + "angular-animate": "^1.5.5", + "angular-mocks": "^1.5.5", + "ckeditor": "ckeditor/ckeditor-releases#full/4.5.x", + "angular-ui-tree": "^2.15.0", "alertify": "0.3.10", "intro.js": "0.8.0", - "pouchdb": "3.4.0", - "ng-file-upload": "4.0.0" + "pouchdb": "^5.3.2" } } diff --git a/OpenNote/index.html b/OpenNote/index.html index 04ac692..2c4bf06 100644 --- a/OpenNote/index.html +++ b/OpenNote/index.html @@ -38,8 +38,6 @@ - - diff --git a/OpenNote/openNote/controllers/folderController.js b/OpenNote/openNote/controllers/folderController.js index 436b116..6964baf 100644 --- a/OpenNote/openNote/controllers/folderController.js +++ b/OpenNote/openNote/controllers/folderController.js @@ -10,6 +10,7 @@ openNote.controller("folderController", function( $scope, $scope.folderEditMode = false; $scope.currentFolder = {}; $scope.parentFolder = null; + $scope.currentFolderContents = []; //add buttons if($routeParams.id) @@ -50,6 +51,27 @@ openNote.controller("folderController", function( $scope, helpText: $rootScope.helpContent.newFolderButton }); + if($routeParams.id) + $rootScope.buttons.push({ + text: "Cut", + action: function(){ + $rootScope.clipboard=$scope.currentFolder; + alertify.success("Folder copied to clipboard"); + } + }); + + if($rootScope.clipboard && $rootScope.clipboard!=$scope.currentFolder) + $rootScope.buttons.push({ + text: "Paste", + action: function(){ + $rootScope.$emit("moveKey", {//fire off an event to tell everyone we just modified a folder + destFolder: $scope.currentFolder, + moveObject: $rootScope.clipboard + }); + $rootScope.clipboard=null; + } + }); + $rootScope.buttons.push({ text: "Search", action: function(){ @@ -237,5 +259,5 @@ openNote.controller("folderController", function( $scope, }; //Load current folder - $timeout($scope.loadCurrentFolder); + $timeout($scope.loadCurrentFolder); }); diff --git a/OpenNote/openNote/controllers/listController.js b/OpenNote/openNote/controllers/listController.js index 54b3bea..effa98b 100644 --- a/OpenNote/openNote/controllers/listController.js +++ b/OpenNote/openNote/controllers/listController.js @@ -12,7 +12,7 @@ openNote.controller("listController", function( $scope, userService, $timeout, config) { - $scope.data = {}; + $scope.data = []; /** * Toggle collapse @@ -60,6 +60,33 @@ openNote.controller("listController", function( $scope, }); }); + /** + * + * Move key + * @param request.destFolder - + * @param request.moveObject - object to move + */ + $rootScope.$on("moveKey", function(event, request) { + //Confirm action + alertify.confirm("Are you sure you want to move "+(request.moveObject.name || request.moveObject.title)+" into "+ request.destFolder.name+"?" , function (confirm) { + if (confirm){ + var origParrentFolderID=request.moveObject.parentFolderID; + + request.moveObject.parentFolderID=request.destFolder._id; + storageService.database().put(request.moveObject).then(function(){ + $rootScope.$emit("changedFolder", {//fire off an event to tell everyone we just modified a folder + folder: request.moveObject, + oldParrentFolderID: origParrentFolderID + }); + }).catch(function(error){ + throw error; + }); + } + + return $rootScope.$emit("reloadListView", {});//Always reload + }); + }); + /** * @param item - the item the filter */ @@ -92,32 +119,20 @@ openNote.controller("listController", function( $scope, if(event.dest.nodesScope.$nodeScope) destFolder = event.dest.nodesScope.$nodeScope.$modelValue; - var destName="Home"; - var destID = null; - if(destFolder){//is dest the home folder? - destName=destFolder.doc.name;//Set defaults - destID = destFolder.doc._id; + if(!destFolder){//is dest the home folder? + destFolder={ + doc:{ + name: "Home", + _id:null + } + }; } - if(sourceFolder.doc.parentFolderID!=destID){ - //Confirm action - alertify.confirm("Are you sure you want to move "+sourceFolder.doc.name+" into "+ destName+"?" , function (confirm) { - if (confirm) { - var origParrentFolderID=sourceFolder.parentFolderID; - - sourceFolder.doc.parentFolderID=destID; - storageService.database().put(sourceFolder.doc).then(function(){ - $rootScope.$emit("changedFolder", {//fire off an event to tell everyone we just modified a folder - folder: sourceFolder, - oldParrentFolderID: origParrentFolderID - }); - }).catch(function(error){ - console.log(error);//FIXME - }); - } - else - $rootScope.$emit("reloadListView", {}); //refresh either way - }); + if(sourceFolder.doc.parentFolderID!=destFolder.doc._id){ + $rootScope.$emit("moveKey", {//fire off an event to tell everyone we just modified a folder + destFolder: destFolder.doc, + moveObject: sourceFolder.doc + }); } } }; diff --git a/OpenNote/openNote/controllers/noteController.js b/OpenNote/openNote/controllers/noteController.js index bde0b66..b64a3b6 100644 --- a/OpenNote/openNote/controllers/noteController.js +++ b/OpenNote/openNote/controllers/noteController.js @@ -32,6 +32,16 @@ openNote.controller("noteController", function( $scope, }; }; + var copyButton = function(note){ + return { + text: "Cut", + action: function(){ + $rootScope.clipboard=note; + alertify.success("Note copied to clipboard"); + } + }; + }; + /** * return the clear button */ @@ -45,6 +55,26 @@ openNote.controller("noteController", function( $scope, }; }; + var editButton = function(){ + return { + text: "Edit", + action: function(){ + activateEditMode(); + }, + helpText: $rootScope.helpContent.editButton + }; + }; + + var upButton = function(folderID){ + return { + text: "Go up a folder", + action: function(){ + $location.url("/folder/"+folderID); + }, + helpText: $rootScope.helpContent.editButton + }; + }; + /** * Take us into edit mode */ @@ -82,25 +112,14 @@ openNote.controller("noteController", function( $scope, storageService.database().get($routeParams.id).then(function(doc){ $scope.note=doc; $(".notePartial").fadeIn(config.fadeSpeedLong()); - $scope.$apply(); - }); - //Add buttons - $rootScope.buttons.push({ - text: "Go up a folder", - action: function(){ - $location.url("/folder/"+$scope.note.parentFolderID); - }, - helpText: $rootScope.helpContent.editButton - }); + //Add buttons + $rootScope.buttons.push(upButton($scope.note.parentFolderID)); + $rootScope.buttons.push(copyButton($scope.note)); + $rootScope.buttons.push(editButton()); - $rootScope.buttons.push({ - text: "Edit", - action: function(){ - activateEditMode(); - }, - helpText: $rootScope.helpContent.editButton - }); + $scope.$apply(); + }); } /** @@ -126,7 +145,7 @@ openNote.controller("noteController", function( $scope, $(".notePartial").fadeOut(config.fadeSpeedShort()); storageService.database().remove($scope.note).then(function(){ detachWindowUnload(); - alertify.success("Note Deleted",5); //all done. close the notify dialog + alertify.success("Note Deleted"); //all done. close the notify dialog $location.url("/folder/"+folderID); $scope.$apply(); }); diff --git a/OpenNote/openNote/openNote.config.js b/OpenNote/openNote/openNote.config.js index e4ca445..14ca3a0 100644 --- a/OpenNote/openNote/openNote.config.js +++ b/OpenNote/openNote/openNote.config.js @@ -7,7 +7,7 @@ openNote.value("config", { * Get current version */ getVersion: function(){ - return "15.07.00"; + return "16.06.00"; }, /** diff --git a/OpenNote/openNote/openNote.js b/OpenNote/openNote/openNote.js index 56cf70e..6d8dae3 100644 --- a/OpenNote/openNote/openNote.js +++ b/OpenNote/openNote/openNote.js @@ -8,8 +8,7 @@ var openNote = angular.module("openNote", [ "ngRoute", "ngResource", "ngSanitize", "ngAnimate", - "ui.tree", - "ngFileUpload"]); + "ui.tree"]); /** * Used to redirect users to login if their token has expired diff --git a/OpenNote/openNote/partials/folderPartial.html b/OpenNote/openNote/partials/folderPartial.html index ddb05af..c72c527 100644 --- a/OpenNote/openNote/partials/folderPartial.html +++ b/OpenNote/openNote/partials/folderPartial.html @@ -16,7 +16,9 @@ -
+

{{folder.doc.name}}

@@ -26,7 +28,9 @@

-
+

{{note.doc.title}}