Merge pull request #18 from Flatte/develop

Develop

Author: micanose

README.md

@@ -29,7 +29,7 @@ Easy and free registration
 ## How to use
 ### Install
 ##### CDN
-	<script type="text/javascript" src="https://cdn.rawgit.com/Flatte/Flatte-Web/1.0.1-beta.87/dist/flatte.min.js"></script>
+	<script type="text/javascript" src="https://cdn.rawgit.com/Flatte/Flatte-Web/1.0.1-beta.88/dist/flatte.min.js"></script>
 ##### Bower
 	$ bower install flatte
 If you don't want to use bower or cdn, you can manually download the latest version of [flatte.min.js](https://raw.githubusercontent.com/Flatte/Flatte-Web/master/dist/flatte.min.js). 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "flatte",
-  "version": "1.0.1-beta.87",
+  "version": "1.0.1-beta.88",
   "main": "dist/flatte.js",
   "description": "Client-Side NOSql Firebase Realtime Database modeling and management system. (only with angularjs for now...)",
   "keywords": [

dist/flatte.js

@@ -2,7 +2,7 @@
  *
  * Client-Side nosql Firebase Realtime Database save management.
  * @link https://flatte.github.io/Flatte-Web/
- * @version v.1.0.1-beta.87 - Tue Sep 05 2017 17:07:42 GMT+0300 (Türkiye Standart Saati)
+ * @version v.1.0.1-beta.88 - Tue Sep 05 2017 21:11:41 GMT+0300 (Türkiye Standart Saati)
  *
  * Copyright (c) 2017 Flatte - Sezer Ekinci <sezer@maxabab.com>, Kaan Ekinci <kaan@maxabab.com>
  * @license MIT License, https://opensource.org/licenses/MIT
@@ -252,22 +252,36 @@
 
 								promises.push($q(function (resolve, reject) {
 									placeIDs(path,manifestPath,runRef.split('/'),"#").then(function(resRef){
-										placeIDs(path,manifestPath,options.saveValue.split('/'),"#").then(function(resValue){
-											commands.saveValue(ref, runData, resRef.join('/'), resValue.join('/'), action,manifestPath).then(function (res) {
+										if (typeof saveValue === "string") {
+											placeIDs(path,manifestPath,options.saveValue.split('/'),"#").then(function(resValue){
+												commands.saveValue(ref, runData, resRef.join('/'), resValue.join('/'), action,manifestPath).then(function (res) {
+													angular.extend(results,res);
+													resolve();
+												}).catch(function(err){ reject(err); return false; });
+											});
+										} else {
+											commands.saveValue(ref, runData, resRef.join('/'), options.saveValue, action,manifestPath).then(function (res) {
 												angular.extend(results,res);
 												resolve();
 											}).catch(function(err){ reject(err); return false; });
-										});
+										}
 									});
 								}));
 								promises.push($q(function (resolve, reject) {
 									placeIDs(path,manifestPath,runRef.split('/'),"#").then(function(resRef){
-										placeIDs(path,manifestPath,options.deleteValue.split('/'),"#").then(function(resValue){
-											commands.deleteValue(ref, runData, resRef.join('/'), resValue.join('/'), action,manifestPath).then(function (res) {
+										if (typeof deleteValue === "string") {
+											placeIDs(path,manifestPath,options.deleteValue.split('/'),"#").then(function(resValue){
+												commands.deleteValue(ref, runData, resRef.join('/'), resValue.join('/'), action,manifestPath).then(function (res) {
+													angular.extend(results,res);
+													resolve();
+												}).catch(function(err){ reject(err); return false; });
+											});
+										} else {
+											commands.deleteValue(ref, runData, resRef.join('/'), options.deleteValue, action,manifestPath).then(function (res) {
 												angular.extend(results,res);
 												resolve();
 											}).catch(function(err){ reject(err); return false; });
-										});
+										}
 									});
 								}));
 
@@ -279,8 +293,8 @@
 
 								if (
 									(
-										((action === "save") && ((options.saveValue === null) || (options.saveValue === "$") || (options.saveValue.trim() === ""))) ||
-										((action !== "save") && ((options.deleteValue === null) || (options.deleteValue === "$") || (options.deleteValue.trim() === "")))
+										((action === "save") && ((options.saveValue === null) || (options.saveValue === "$") || (typeof options.saveValue === "string" && options.saveValue.trim() === ""))) ||
+										((action !== "save") && ((options.deleteValue === null) || (options.deleteValue === "$") || (typeof options.deleteValue === "string" && options.deleteValue.trim() === "")))
 									) && angular.isObject(loopData)
 								) {
 									angular.forEach(loopData,function(value,key){
@@ -361,7 +375,7 @@
 								if (options.save.value !== ".doNothing") {
 									if (action === "save") {
 										promises.push($q(function (resolve, reject) {
-											commands.saveValue(ref, "1", (path + "/" + options.save.key).split('/'), options.save.value, action,manifestPath).then(function (res) {
+											commands.saveValue(ref, data, (path + "/" + options.save.key).split('/'), options.save.value, action,manifestPath).then(function (res) {
 												if (!angular.equals(data,res)) angular.extend(results, res);
 												resolve();
 											}).catch(function (err) {