Merge pull request #18252 from justindarc/bug991396

Bug 991396 - [camera][madai] delete dialogue button should be red and sa... r=djf
mozilla-b2g · Apr 17, 2014 · b1fba95 · b1fba95
1 parent 3b4f482
commit b1fba95
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 33 deletions.
diff --git a/apps/camera/js/config/require.js b/apps/camera/js/config/require.js
@@ -11,6 +11,7 @@ require.config({
     'VideoPlayer': '../shared/js/media/video_player',
     'MediaFrame': '../shared/js/media/media_frame',
     'BlobView': '../shared/js/blobview',
+    'CustomDialog': '../shared/js/custom_dialog',
     'debug': 'vendor/debug'
   },
   shim: {
@@ -40,6 +41,9 @@ require.config({
     },
     'GestureDetector': {
       exports: 'GestureDetector'
+    },
+    'CustomDialog': {
+      exports: 'CustomDialog'
     }
   }
 });
diff --git a/apps/camera/js/controllers/preview-gallery.js b/apps/camera/js/controllers/preview-gallery.js
@@ -10,6 +10,7 @@ var bindAll = require('lib/bind-all');
 var PreviewGalleryView = require('views/preview-gallery');
 var createThumbnailImage = require('lib/create-thumbnail-image');
 var preparePreview = require('lib/prepare-preview-blob');
+var CustomDialog = require('CustomDialog');
 
 /**
  * The size of the thumbnail images we generate.
@@ -154,6 +155,7 @@ PreviewGalleryController.prototype.deleteCurrentItem = function() {
   var item = this.items[index];
   var filepath = item.filepath;
   var msg;
+  var self = this;
 
   if (item.isVideo) {
     msg = navigator.mozL10n.get('delete-video?');
@@ -162,14 +164,28 @@ PreviewGalleryController.prototype.deleteCurrentItem = function() {
     msg = navigator.mozL10n.get('delete-photo?');
   }
 
-  if (window.confirm(msg)) {
-    this.updatePreviewGallery(index);
+  CustomDialog.show('',
+                    msg,
+                    { title: navigator.mozL10n.get('cancel'),
+                      callback: closeDialog },
+                    { title: navigator.mozL10n.get('delete'),
+                      callback: deleteItem,
+                      recommend: false });
+
+  function closeDialog() {
+    CustomDialog.hide();
+  }
+
+  function deleteItem() {
+    CustomDialog.hide();
+
+    self.updatePreviewGallery(index);
 
     // Actually delete the file
     if (item.isVideo) {
-      this.storage.deleteVideo(filepath);
+      self.storage.deleteVideo(filepath);
     } else {
-      this.storage.deleteImage(filepath);
+      self.storage.deleteImage(filepath);
     }
   }
 };

diff --git a/apps/camera/locales/camera.en-US.properties b/apps/camera/locales/camera.en-US.properties
@@ -22,6 +22,8 @@ close-button  = Close
 
 delete-photo? = Delete photo?
 delete-video? = Delete video?
+cancel = Cancel
+delete = Delete
 
 # LOCALIZATION NOTE(mp): MP stands for mega-pixels
 mp = MP

diff --git a/apps/camera/test/unit/controllers/preview-gallery_test.js b/apps/camera/test/unit/controllers/preview-gallery_test.js
@@ -138,34 +138,6 @@ suite('controllers/preview-gallery', function() {
       assert.ok(arg.data.filepaths[0] === item.filepath);
     });
 
-    test('Should deleteCurrentItem which is image', function() {
-      var item = {
-        blob: {},
-        filepath: 'root/fileName',
-        isVideo: false
-      };
-      this.previewGalleryController.items = [item];
-      this.previewGalleryController.currentItemIndex = 0;
-      this.previewGalleryController.deleteCurrentItem();
-
-      assert.ok(this.previewGalleryController.storage.deleteImage
-                .calledWith('root/fileName'));
-    });
-
-    test('Should deleteCurrentItem which is video', function() {
-      var item = {
-        blob: {},
-        filepath: 'root/fileName',
-        isVideo: true
-      };
-      this.previewGalleryController.items = [item];
-      this.previewGalleryController.currentItemIndex = 0;
-      this.previewGalleryController.deleteCurrentItem();
-
-      assert.ok(this.previewGalleryController.storage.deleteVideo
-                .calledWith('root/fileName'));
-    });
-
     test('Check onNewMedia callback', function() {
       var item = {
         blob: {},

diff --git a/apps/camera/test/unit/setup.js b/apps/camera/test/unit/setup.js
@@ -16,7 +16,8 @@ mocha.setup({
     'CONFIG_AVG_JPEG_COMPRESSION_RATIO',
     'MediaFrame',
     'confirm',
-    'MozActivity'
+    'MozActivity',
+    'CustomDialog'
   ]
 });
 
@@ -40,6 +41,7 @@ requireApp('camera/js/vendor/alameda.js', function() {
       'VideoPlayer': '../shared/js/media/video_player',
       'MediaFrame': '../shared/js/media/media_frame',
       'BlobView': '../shared/js/blobview',
+      'CustomDialog': '../shared/js/custom_dialog',
       'debug': 'vendor/debug'
     },
     shim: {
@@ -68,6 +70,9 @@ requireApp('camera/js/vendor/alameda.js', function() {
       },
       'GestureDetector': {
         exports: 'GestureDetector'
+      },
+      'CustomDialog': {
+        exports: 'CustomDialog'
       }
     }
   });