Skip to content

Commit

Permalink
#149 Copy and paste code. Updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@FoxUSA
FoxUSA committed May 9, 2016
1 parent 60baac8 commit 31f315a
Show file tree
Hide file tree
Showing 11 changed files with 120 additions and 87 deletions.
2 changes: 1 addition & 1 deletion .jshintrc
View file
Expand Up @@ -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}
}
2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Expand Up @@ -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"]);
Expand Down
23 changes: 0 additions & 23 deletions OpenNote/.project
View file

This file was deleted.

21 changes: 10 additions & 11 deletions OpenNote/bower.json
View file
Expand Up @@ -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"
}
}
2 changes: 0 additions & 2 deletions OpenNote/index.html
View file
Expand Up @@ -38,8 +38,6 @@
<script src="bower_components/angular-route/angular-route.min.js"></script>
<script src="bower_components/angular-sanitize/angular-sanitize.min.js"></script>
<script src="bower_components/angular-ui-tree/dist/angular-ui-tree.min.js" ></script>
<script src="bower_components/ng-file-upload/ng-file-upload-shim.min.js"></script> <!-- for no html5 browsers support -->
<script src="bower_components/ng-file-upload/ng-file-upload.min.js"></script>

<script src="bower_components/intro.js/minified/intro.min.js"></script>
<script src="bower_components/alertify/alertify.min.js"></script>
Expand Down
24 changes: 23 additions & 1 deletion OpenNote/openNote/controllers/folderController.js
View file
Expand Up @@ -10,6 +10,7 @@ openNote.controller("folderController", function( $scope,
$scope.folderEditMode = false;
$scope.currentFolder = {};
$scope.parentFolder = null;
$scope.currentFolderContents = [];

//add buttons
if($routeParams.id)
Expand Down Expand Up @@ -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(){
Expand Down Expand Up @@ -237,5 +259,5 @@ openNote.controller("folderController", function( $scope,
};

//Load current folder
$timeout($scope.loadCurrentFolder);
$timeout($scope.loadCurrentFolder);
});
65 changes: 40 additions & 25 deletions OpenNote/openNote/controllers/listController.js
View file
Expand Up @@ -12,7 +12,7 @@ openNote.controller("listController", function( $scope,
userService,
$timeout,
config) {
$scope.data = {};
$scope.data = [];

/**
* Toggle collapse
Expand Down Expand Up @@ -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
*/
Expand Down Expand Up @@ -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
});
}
}
};
Expand Down
55 changes: 37 additions & 18 deletions OpenNote/openNote/controllers/noteController.js
View file
Expand Up @@ -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
*/
Expand All @@ -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
*/
Expand Down Expand Up @@ -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();
});
}

/**
Expand All @@ -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();
});
Expand Down
2 changes: 1 addition & 1 deletion OpenNote/openNote/openNote.config.js
View file
Expand Up @@ -7,7 +7,7 @@ openNote.value("config", {
* Get current version
*/
getVersion: function(){
return "15.07.00";
return "16.06.00";
},

/**
Expand Down
3 changes: 1 addition & 2 deletions OpenNote/openNote/openNote.js
View file
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions OpenNote/openNote/partials/folderPartial.html
View file
Expand Up @@ -16,7 +16,9 @@

</div>

<div ng-repeat="folder in currentFolderContents.filter(folderFilter) | orderBy: 'doc.name'" class="startHidden randomFadeInDirective box folder" ng-click="loadFolder(folder);">
<div ng-repeat="folder in currentFolderContents.filter(folderFilter) | orderBy: 'doc.name'"
class="startHidden randomFadeInDirective box folder"
ng-click="loadFolder(folder);">
<h4>
{{folder.doc.name}}
</h4>
Expand All @@ -26,7 +28,9 @@ <h4>
</p>
</div>

<div ng-repeat="note in currentFolderContents.filter(noteFilter) | orderBy: 'doc.title'" class="startHidden box randomFadeInDirective note" ng-click="loadNote(note);">
<div ng-repeat="note in currentFolderContents.filter(noteFilter) | orderBy: 'doc.title'"
class="startHidden box randomFadeInDirective note"
ng-click="loadNote(note);">
<h4>
{{note.doc.title}}
</h4>
Expand Down

0 comments on commit 31f315a

Please sign in to comment.