Changeset 6974 for sandbox/2.4.2-expresso1/prototype/modules/calendar/js/task.helpers.js

Timestamp:

08/09/12 12:25:44 (12 years ago)

Author:

acoutinho

Message:

Ticket #2966 - Correcoes de bugs e melhorias / suporte a historico em atividades

File:

• sandbox/2.4.2-expresso1/prototype/modules/calendar/js/task.helpers.js (modified) (6 diffs)

sandbox/2.4.2-expresso1/prototype/modules/calendar/js/task.helpers.js

@@ -431 +431 @@
     UI.dialogs.addTask.find(".input-group .h1").Watermark("Tarefa sem título");
     if (User.preferences.hourFormat.length == 5) {
-        UI.dialogs.addTask.find(".end-time, .start-time").mask("99:99", {
+        UI.dialogs.addTask.find(".end-time, .start-time, .time-previsao").mask("99:99", {
             completed: function () {
                 updateMap();
@@ -653 +653 @@
             'type': 'question',
             'overlay_opacity': '0.5',
-            'buttons': ['Sim', 'Não'],
+            'buttons': ['Sim', 'Não'],
             'onClose': function (clicked) {
                 if (clicked == 'Sim') {
@@ -683 +683 @@
     });
     var maxSizeFile = 2000000;
-    $('#fileupload').fileupload({
+    $('#fileuploadtask').fileupload({
         sequentialUploads: true,
         add: function (e, data) {
@@ -697 +697 @@
                 if (file.size > maxSizeFile) attach.error = 'Tamanho de arquivo nao permitido!!'
 
-                $('.attachments-list').append(DataLayer.render(path + 'templates/attachment_add_itemlist.ejs', {
+                $('div.new-task-win .attachments-list').append(DataLayer.render(path + 'templates/attachment_add_itemlist.ejs', {
                     file: attach
                 }));
 
                 if (file.size < maxSizeFile) {
-                    $('.fileinput-button.new').append(data.fileInput[0]).removeClass('new');
-                    $('.attachments-list').find('[type=file]').addClass('hidden');
-
-                } else $('.fileinput-button.new').removeClass('new');
-
-
-                $('.attachments-list').find('.button.close').button({
+                    $('div.new-task-win .fileinput-button.new').append(data.fileInput[0]).removeClass('new');
+                    $('div.new-task-win .attachments-list').find('[type=file]').addClass('hidden');
+
+                } else $('div.new-task-win .fileinput-button.new').removeClass('new');
+
+
+                $('div.new-task-win .attachments-list').find('.button.close').button({
                     icons: {
                         primary: "ui-icon-close"
@@ -715 +715 @@
                 }).click(function () {
                     var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
-                    $('.attachment-list').find('input[value="' + idAttach + '"]')
+                    $('div.new-task-win .attachment-list').find('input[value="' + idAttach + '"]')
                     $(this).parent().remove();
                 });
@@ -722 +722 @@
         },
         done: function (e, data) {
-            var currentUpload = $('.progress.after-upload:first').removeClass('after-upload').addClass('on-complete').hide();
+            var currentUpload = $('div.new-task-win .progress.after-upload:first').removeClass('after-upload').addClass('on-complete').hide();
 
             if ( !! data.result && data.result != "[]") {
                 var newAttach = (attch = jQuery.parseJSON(data.result)) ? attch : jQuery.parseJSON(data.result[0].activeElement.childNodes[0].data);
-                $('.attachment-list').append('<input tyepe="hidden" name="attachment[]" value="' + newAttach['attachment'][0][0].id + '"/>');
+                $('div.new-task-win .attachment-list').append('<input tyepe="hidden" name="attachment[]" value="' + newAttach['attachment'][0][0].id + '"/>');
                 currentUpload.removeClass('on-complete').parents('p').append('<input type="hidden" name="fileId[]" value="' + newAttach['attachment'][0][0].id + '"/>').find('.status-upload').addClass('ui-icon ui-icon-check');
             } else currentUpload.removeClass('on-complete').parents('p').find('.status-upload').addClass('ui-icon ui-icon-cancel');
         }
     });
-    $('.attachments-list .button').button();
-
-    if ( !! window.FormData) $('#fileupload').bind('fileuploadstart', function () {
+    $('div.new-task-win .attachments-list .button').button();
+
+    if ( !! window.FormData) $('#fileuploadtask').bind('fileuploadstart', function () {
         var widget = $(this),
-            progressElement = $('#fileupload-progress').fadeIn(),
+            progressElement = $('#fileupload-progress-task').fadeIn(),
             interval = 500,
             total = 0,