From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- js/mediators/drag-drop-mediator.js | 22 +++++++------- js/mediators/io-mediator.js | 60 +++++++++++++++++++------------------- 2 files changed, 41 insertions(+), 41 deletions(-) (limited to 'js/mediators') diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js index 7669dcfc..f23ec34c 100755 --- a/js/mediators/drag-drop-mediator.js +++ b/js/mediators/drag-drop-mediator.js @@ -80,8 +80,8 @@ exports.DragDropMediator = Montage.create(Component, { handleDropEvent: { value: function(e){ - // - var i, files = e.dataTransfer.files, position = {x: e.offsetX, y: e.offsetY}, self = this; + // + var i, files = e.dataTransfer.files, position = {x: e.offsetX, y: e.offsetY}, self = this; var xferString = e.dataTransfer.getData("text/plain"); if(xferString) { @@ -93,17 +93,17 @@ exports.DragDropMediator = Montage.create(Component, { } } } - // - for (i=0; files[i]; i++) { - if (files[i].type.indexOf('image') !== -1) { + // + for (i=0; files[i]; i++) { + if (files[i].type.indexOf('image') !== -1) { this.application.ninja.ioMediator.createFileFromBinary(files[i], {"addFileToStage" : self.addImageElement.bind(self), "position": position}); - } else { - //TODO: NOT AN IMAGE, HANDLE SPECIAL CASE - } - } - //Not sure why return value should be, seemed as false to work - return false; + } else { + //TODO: NOT AN IMAGE, HANDLE SPECIAL CASE + } + } + //Not sure why return value should be, seemed as false to work + return false; } }, diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js index c69cbafa..41944f74 100644 --- a/js/mediators/io-mediator.js +++ b/js/mediators/io-mediator.js @@ -30,11 +30,11 @@ POSSIBILITY OF SUCH DAMAGE. //////////////////////////////////////////////////////////////////////// // -var Montage = require("montage/core/core").Montage, - Component = require("montage/ui/component").Component, - FileIo = require("js/io/system/fileio").FileIo, - ProjectIo = require("js/io/system/projectio").ProjectIo, - TemplateMediator = require("js/document/mediators/template").TemplateDocumentMediator; +var Montage = require("montage/core/core").Montage, + Component = require("montage/ui/component").Component, + FileIo = require("js/io/system/fileio").FileIo, + ProjectIo = require("js/io/system/projectio").ProjectIo, + TemplateMediator = require("js/document/mediators/template").TemplateDocumentMediator; //////////////////////////////////////////////////////////////////////// // exports.IoMediator = Montage.create(Component, { @@ -68,11 +68,11 @@ exports.IoMediator = Montage.create(Component, { //////////////////////////////////////////////////////////////////// // parseToTemplate: { - value: function(content, template) { - // + value: function(content, template) { + // if (template.name.toLowerCase() === 'banner' || template.name.toLowerCase() === 'animation') { - //Getting dimensions of banner - var dimensions = template.id.split('x'); + //Getting dimensions of banner + var dimensions = template.id.split('x'); dimensions = {width: String(dimensions[0])+'px', height: String(dimensions[1])+'px'}; // content = content.replace(/Dimensions@@@/gi, "Dimensions@@@"+template.id); @@ -81,7 +81,7 @@ exports.IoMediator = Montage.create(Component, { } // return content; - } + } }, //////////////////////////////////////////////////////////////////// // @@ -113,8 +113,8 @@ exports.IoMediator = Montage.create(Component, { //Sending result to callback if requested for handling if (callback) callback(result); //Codes - // 204: File exists | 400: File exists - // 201: File succesfully created | 500: Unknown (Probably cloud API not running) + // 204: File exists | 400: File exists + // 201: File succesfully created | 500: Unknown (Probably cloud API not running) } }, //////////////////////////////////////////////////////////////////// @@ -159,9 +159,9 @@ exports.IoMediator = Montage.create(Component, { 204: File exists (Success) 404: File does not exists (Failure) 500: Unknown (Probably cloud API not running) - + (Below only present if succesfull 204) - + Object.content Object.extension Object.name @@ -186,9 +186,9 @@ exports.IoMediator = Montage.create(Component, { case 'html': //Getting content from function to properly handle saving assets (as in external if flagged) if (doc.template && (doc.template.type === 'banner' || doc.template.type === 'animation')) { - parsedDoc = this.tmplt.parseNinjaTemplateToHtml(true, doc, true, libCopyCallback); + parsedDoc = this.tmplt.parseNinjaTemplateToHtml(true, doc, true, libCopyCallback); } else { - parsedDoc = this.tmplt.parseNinjaTemplateToHtml(true, doc, false, libCopyCallback); + parsedDoc = this.tmplt.parseNinjaTemplateToHtml(true, doc, false, libCopyCallback); } break; default: @@ -196,21 +196,21 @@ exports.IoMediator = Montage.create(Component, { break; } if (parsedDoc) { - //Making call to save file - save = this.fio.saveFile({uri: doc.file.uri, contents: parsedDoc.content}); - //Checking for callback - if (callback) callback(save); - //Checking for libraries, making callback if specified - if (!parsedDoc.libs && libCopyCallback) libCopyCallback(true); - // - return {montageId: parsedDoc.montageId, canvasId: parsedDoc.canvasId}; + //Making call to save file + save = this.fio.saveFile({uri: doc.file.uri, contents: parsedDoc.content}); + //Checking for callback + if (callback) callback(save); + //Checking for libraries, making callback if specified + if (!parsedDoc.libs && libCopyCallback) libCopyCallback(true); + // + return {montageId: parsedDoc.montageId, canvasId: parsedDoc.canvasId}; } else { - //Making call to save file - save = this.fio.saveFile({uri: doc.file.uri, contents: content}); - //Checking for callback - if (callback) callback(save); - // - return null; + //Making call to save file + save = this.fio.saveFile({uri: doc.file.uri, contents: content}); + //Checking for callback + if (callback) callback(save); + // + return null; } } }, -- cgit v1.2.3 From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:53:10 -0700 Subject: Remove trailing spaces --- js/mediators/drag-drop-mediator.js | 2 +- js/mediators/io-mediator.js | 4 ++-- js/mediators/keyboard-mediator.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'js/mediators') diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js index f23ec34c..cacdcbb6 100755 --- a/js/mediators/drag-drop-mediator.js +++ b/js/mediators/drag-drop-mediator.js @@ -37,7 +37,7 @@ exports.DragDropMediator = Montage.create(Component, { value: null, writable: true }, - + dropDelegate: { value: null }, diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js index 41944f74..af0f4dd6 100644 --- a/js/mediators/io-mediator.js +++ b/js/mediators/io-mediator.js @@ -159,9 +159,9 @@ exports.IoMediator = Montage.create(Component, { 204: File exists (Success) 404: File does not exists (Failure) 500: Unknown (Probably cloud API not running) - + (Below only present if succesfull 204) - + Object.content Object.extension Object.name diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js index 15ee1e33..015f84e3 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js @@ -180,7 +180,7 @@ exports.KeyboardMediator = Montage.create(Component, { this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.brushToolIndex] }); return; } - + // Shortcut for Rectangle Tool is R // unless the user is pressing the command key. // If the user is pressing the command key, they want to refresh the browser. -- cgit v1.2.3