new changes

Author: petersirka

download-file-database-nosql/controllers/default.js

@@ -26,12 +26,15 @@ function static_image(req, res, isValidation) {
     var db = self.database('images');
     var id = req.uri.pathname.replace('/', '').replace('.png', '');
 
-    // check client cache via etag
+    // Check the client cache via etag
     // if not modified - framework send automatically 304
     // id === etag
-    //if (self.notModified(req, res, id))
-        //return;
-
+   
+    /*
+    if (self.notModified(req, res, id))
+        return;
+    */
+   
     db.binary.read(id, function(err, stream, header) {
 
         if (err) {
@@ -41,16 +44,16 @@ function static_image(req, res, isValidation) {
 
         // Set HTTP cache via etag
         // Documentation: http://docs.totaljs.com/Framework/#framework.setModified
-        //self.setModified(req, res, id);
-
-        // Documentation: http://docs.totaljs.com/Framework/#framework.responseStream
-        // self.responseStream(req, res, 'image/png', stream);
+        // self.setModified(req, res, id);
 
         // Documentation: http://docs.totaljs.com/Framework/#framework.responseImage
         self.responseImage(req, res, stream, function(image) {
             image.resize('50%');
             image.output('png');
             image.minify();
         });
+
+        // or
+        // self.responseStream(req, res, 'image/png', stream);
     });
 }

download-stream/controllers/default.js

@@ -6,6 +6,5 @@ exports.install = function(framework) {
 
 function file_download() {
 	var self = this;
-	// Documentation: http://docs.totaljs.com/FrameworkController/#controller.stream
 	self.stream('application/pdf', fs.createReadStream(self.path.public('totaljs.pdf')), 'logo.pdf');
 }

external-compile-sass/controllers/default.js

@@ -1,7 +1,3 @@
 exports.install = function(framework) {
-	framework.route('/', view_homepage);
-};
-
-function view_homepage() {
-	this.view('homepage');
-}
+	framework.route('/');
+};

external-compile-sass/definitions/sass.js

@@ -1,6 +1,6 @@
 var sass = require('node-sass');
 
-// Documentation: http://docs.totaljs.com/Framework/#framework.onCompileCSS
-framework.onCompileCSS = function (filename, content) {
+framework.onCompileStyle = function (filename, content) {
+	// if filename === '' then it is the inline style
 	return sass.renderSync({ data: content, outputStyle: 'compressed' });
 };

external-compile-uglifyjs/definitions/uglify.js

@@ -1,6 +1,6 @@
 var uglify = require('uglify-js');
 
-// Documentation: http://docs.totaljs.com/Framework/#framework.onCompileJS
-framework.onCompileJS = function (filename, content) {
+framework.onCompileScript = function (filename, content) {
+	// if filename === '' then it is the inline script
 	return uglify.minify(content, { fromString: true }).code;
 };

font-awesome/controllers/default.js

@@ -1,8 +1,3 @@
 exports.install = function(framework) {
-    framework.route('/', view_homepage);
-};
-
-function view_homepage() {
-    var self = this;
-    self.view('homepage');
-}
+    framework.route('/');
+};