alchemy_cms 2.2.rc13 → 2.2.rc14

data/app/assets/javascripts/alchemy/alchemy.dragndrop.js

@@ -2,23 +2,23 @@ if (typeof(Alchemy) === 'undefined') {
   var Alchemy = {};
 }
 
-(function ($) {
+(function($) {
 
   $.extend(Alchemy, {
 
-    SortableElements:function (page_id, form_token) {
+    SortableElements: function(page_id, form_token) {
       $('#element_area .sortable_cell').sortable({
-        items:'div.element_editor',
-        handle:'.element_handle',
-        axis:'y',
-        placeholder:'droppable_element_placeholder',
-        forcePlaceholderSize:true,
-        dropOnEmpty:true,
-        opacity:0.5,
-        cursor:'move',
-        tolerance:'pointer',
-        update:function (event, ui) {
-          var ids = $.map($(this).children(), function (child) {
+        items: 'div.element_editor',
+        handle: '.element_handle',
+        axis: 'y',
+        placeholder: 'droppable_element_placeholder',
+        forcePlaceholderSize: true,
+        dropOnEmpty: true,
+        opacity: 0.5,
+        cursor: 'move',
+        tolerance: 'pointer',
+        update: function(event, ui) {
+          var ids = $.map($(this).children(), function(child) {
             return $(child).attr('data-element-id');
           });
           var params_string = '';
@@ -32,53 +32,57 @@ if (typeof(Alchemy) === 'undefined') {
             }
           }
           $(event.target).css("cursor", "progress");
-          params_string = "page_id=" + page_id + "&authenticity_token=" + encodeURIComponent(form_token) + "&" + $.param({element_ids:ids});
+          params_string = "page_id=" + page_id + "&authenticity_token=" + encodeURIComponent(form_token) + "&" + $.param({
+            element_ids: ids
+          });
           if (cell_id) {
             params_string += "&cell_id=" + cell_id;
           }
           $.ajax({
-            url:Alchemy.routes.order_admin_elements_path,
-            type:'POST',
-            data:params_string,
-            complete:function () {
+            url: Alchemy.routes.order_admin_elements_path,
+            type: 'POST',
+            data: params_string,
+            complete: function() {
               $(event.target).css("cursor", "auto");
               Alchemy.refreshTrashWindow(page_id);
             }
           });
         },
-        start:function (event, ui) {
+        start: function(event, ui) {
           var $textareas = ui.item.find('textarea.default_tinymce, textarea.custom_tinymce');
-          $textareas.each(function () {
+          $textareas.each(function() {
             tinymce.get(this.id).remove();
           });
         },
-        stop:function (event, ui) {
+        stop: function(event, ui) {
           var $textareas = ui.item.find('textarea.default_tinymce, textarea.custom_tinymce');
-          $textareas.each(function () {
+          $textareas.each(function() {
             Alchemy.Tinymce.addEditor(this.id);
           });
         }
       });
     },
 
-    SortableContents:function (selector, token) {
+    SortableContents: function(selector, token) {
       $(selector).sortable({
-        items:'div.dragable_picture',
-        handle:'div.picture_handle',
-        opacity:0.5,
-        cursor:'move',
-        tolerance:'pointer',
-        containment:'parent',
-        update:function (event, ui) {
-          var ids = $.map($(this).children('div.dragable_picture'), function (child) {
+        items: 'div.dragable_picture',
+        handle: 'div.picture_handle',
+        opacity: 0.5,
+        cursor: 'move',
+        tolerance: 'pointer',
+        containment: 'parent',
+        update: function(event, ui) {
+          var ids = $.map($(this).children('div.dragable_picture'), function(child) {
             return child.id.replace(/essence_picture_/, '');
           });
           $(event.originalTarget).css("cursor", "progress");
           $.ajax({
-            url:Alchemy.routes.order_admin_contents_path,
-            type:'POST',
-            data:"authenticity_token=" + encodeURIComponent(token) + "&" + $.param({content_ids:ids}),
-            complete:function () {
+            url: Alchemy.routes.order_admin_contents_path,
+            type: 'POST',
+            data: "authenticity_token=" + encodeURIComponent(token) + "&" + $.param({
+              content_ids: ids
+            }),
+            complete: function() {
               $(event.originalTarget).css("cursor", "move");
             }
           });
@@ -86,22 +90,24 @@ if (typeof(Alchemy) === 'undefined') {
       });
     },
 
-    DraggableTrashItems:function (items_n_cells) {
-      $("#trash_items div.draggable").each(function () {
+    DraggableTrashItems: function(items_n_cells) {
+      $("#trash_items div.draggable").each(function() {
         var cell_classes = '';
         var cell_names = items_n_cells[this.id];
-        $.each(cell_names, function (i) {
+        $.each(cell_names, function(i) {
           cell_classes += '.' + this + '_cell' + ', ';
         });
         $(this).draggable({
-          helper:'clone',
-          iframeFix:'iframe#alchemyPreviewWindow',
-          connectToSortable:cell_classes,
-          start:function (event, ui) {
+          helper: 'clone',
+          iframeFix: 'iframe#alchemyPreviewWindow',
+          connectToSortable: cell_classes,
+          start: function(event, ui) {
             $(this).hide().addClass('dragged');
-            ui.helper.css({width:'300px'});
+            ui.helper.css({
+              width: '300px'
+            });
           },
-          stop:function () {
+          stop: function() {
             $(this).show().removeClass('dragged');
           }
         });

data/app/assets/javascripts/alchemy/alchemy.element_editor_selector.js

@@ -2,33 +2,33 @@ if (typeof(Alchemy) === 'undefined') {
   var Alchemy = {};
 }
 
-(function ($) {
+(function($) {
 
   var ElementEditorSelector = {};
   $.extend(Alchemy, ElementEditorSelector);
 
   Alchemy.ElementEditorSelector = {
 
-    init:function () {
+    init: function() {
       var $elements = $('#element_area .element_editor');
       var self = Alchemy.ElementEditorSelector;
       self.reinit($elements);
     },
 
-    reinit:function (elements) {
+    reinit: function(elements) {
       var self = Alchemy.ElementEditorSelector;
       var $elements = $(elements);
-      $elements.each(function () {
+      $elements.each(function() {
         self.bindEvent(this);
       });
       $elements.find('.element_head').click(self.onClickElement);
-      $elements.find('.element_head').dblclick(function () {
+      $elements.find('.element_head').dblclick(function() {
         var id = $(this).parent().attr('id').replace(/\D/g, '');
         self.foldElement(id);
       });
     },
 
-    onClickElement:function (e) {
+    onClickElement: function(e) {
       var self = Alchemy.ElementEditorSelector;
       var $element = $(this).parent('.element_editor');
       var id = $element.attr('id').replace(/\D/g, '');
@@ -42,12 +42,12 @@ if (typeof(Alchemy) === 'undefined') {
       $selected_element.trigger('Alchemy.SelectElement');
     },
 
-    bindEvent:function (element) {
+    bindEvent: function(element) {
       var self = Alchemy.ElementEditorSelector;
       $(element).bind('Alchemy.SelectElementEditor', self.selectElement);
     },
 
-    selectElement:function (e) {
+    selectElement: function(e) {
       var self = Alchemy.ElementEditorSelector;
       var id = this.id.replace(/\D/g, '');
       var $element = $(this);
@@ -68,15 +68,18 @@ if (typeof(Alchemy) === 'undefined') {
       }
     },
 
-    scrollToElement:function (el) {
-      $('#alchemyElementWindow').scrollTo(el, {duration:400, offset:-10});
+    scrollToElement: function(el) {
+      $('#alchemyElementWindow').scrollTo(el, {
+        duration: 400,
+        offset: -10
+      });
     },
 
-    foldElement:function (id) {
+    foldElement: function(id) {
       var self = Alchemy.ElementEditorSelector;
       $('#element_' + id + '_folder').hide();
       $('#element_' + id + '_folder_spinner').show();
-      $.post(Alchemy.routes.fold_admin_element_path(id), function () {
+      $.post(Alchemy.routes.fold_admin_element_path(id), function() {
         $('#element_' + id + '_folder').show();
         $('#element_' + id + '_folder_spinner').hide();
         self.scrollToElement('#element_' + id);

data/app/assets/javascripts/alchemy/alchemy.elements_window.js

@@ -2,94 +2,98 @@ if (typeof(Alchemy) === 'undefined') {
   var Alchemy = {};
 }
 
-(function ($) {
+(function($) {
 
   var ElementsWindow = {};
   $.extend(Alchemy, ElementsWindow);
 
   Alchemy.ElementsWindow = {
 
-    init:function (path, options, callback) {
+    init: function(path, options, callback) {
       var $dialog = $('<div style="display: none" id="alchemyElementWindow"></div>');
-      var closeCallback = function () {
-        $dialog.dialog("destroy");
-        $('#alchemyElementWindow').remove();
-        Alchemy.ElementsWindow.button.enable();
-      };
-      $dialog.html(Alchemy.getOverlaySpinner({x:420, y:300}));
+      var closeCallback = function() {
+          $dialog.dialog("destroy");
+          $('#alchemyElementWindow').remove();
+          Alchemy.ElementsWindow.button.enable();
+        };
+      $dialog.html(Alchemy.getOverlaySpinner({
+        x: 420,
+        y: 300
+      }));
       Alchemy.ElementsWindow.currentWindow = $dialog.dialog({
-        modal:false,
-        minWidth:422,
-        minHeight:300,
-        height:$(window).height() - 90,
-        title:options.texts.title,
-        show:"fade",
-        hide:"fade",
-        position:[$(window).width() - 428, 84],
-        closeOnEscape:false,
-        create:function () {
+        modal: false,
+        minWidth: 422,
+        minHeight: 300,
+        height: $(window).height() - 90,
+        title: options.texts.title,
+        show: "fade",
+        hide: "fade",
+        position: [$(window).width() - 428, 84],
+        closeOnEscape: false,
+        create: function() {
           $dialog.before(Alchemy.ElementsWindow.createToolbar(options.toolbarButtons));
         },
-        open:function (event, ui) {
+        open: function(event, ui) {
           Alchemy.ElementsWindow.button.disable();
           $.ajax({
-            url:path,
-            success:function (data, textStatus, XMLHttpRequest) {
+            url: path,
+            success: function(data, textStatus, XMLHttpRequest) {
               $dialog.html(data);
               Alchemy.ButtonObserver('#alchemyElementWindow .button');
+              Alchemy.overlayObserver('#alchemyElementWindow');
               Alchemy.Datepicker('#alchemyElementWindow input.date, #alchemyElementWindow input[type="date"]');
               if (callback) {
                 callback.call();
               }
             },
-            error:function (XMLHttpRequest, textStatus, errorThrown) {
+            error: function(XMLHttpRequest, textStatus, errorThrown) {
               Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);
             }
           });
         },
-        beforeClose:function () {
+        beforeClose: function() {
           if (Alchemy.isPageDirty()) {
             Alchemy.openConfirmWindow({
-              title:options.texts.dirtyTitle,
-              message:options.texts.dirtyMessage,
-              okLabel:options.texts.okLabel,
-              cancelLabel:options.texts.cancelLabel,
-              okCallback:closeCallback
+              title: options.texts.dirtyTitle,
+              message: options.texts.dirtyMessage,
+              okLabel: options.texts.okLabel,
+              cancelLabel: options.texts.cancelLabel,
+              okCallback: closeCallback
             });
             return false;
           } else {
             return true;
           }
         },
-        close:closeCallback
+        close: closeCallback
       });
     },
 
-    button:{
-      enable:function () {
+    button: {
+      enable: function() {
         $('div#show_element_window').removeClass('disabled');
       },
-      disable:function () {
+      disable: function() {
         $('div#show_element_window').addClass('disabled');
       },
-      toggle:function () {
+      toggle: function() {
         $('div#show_element_window').toggleClass('disabled');
       }
     },
 
-    createToolbar:function (buttons) {
-      var $toolbar = $('<div id="overlay_toolbar"></div>'), btn;
+    createToolbar: function(buttons) {
+      var $toolbar = $('<div id="overlay_toolbar"></div>'),
+        btn;
       for (i = 0; i < buttons.length; i++) {
         btn = buttons[i];
         $toolbar.append(
-          Alchemy.ToolbarButton({
-            buttonTitle:btn.title,
-            buttonLabel:btn.label,
-            iconClass:btn.iconClass,
-            onClick:btn.onClick,
-            buttonId:btn.buttonId
-          })
-        );
+        Alchemy.ToolbarButton({
+          buttonTitle: btn.title,
+          buttonLabel: btn.label,
+          iconClass: btn.iconClass,
+          onClick: btn.onClick,
+          buttonId: btn.buttonId
+        }));
       }
       return $toolbar;
     }

data/app/assets/javascripts/alchemy/alchemy.file_progress.js

@@ -2,11 +2,11 @@ if (typeof(Alchemy) === 'undefined') {
   var Alchemy = {};
 }
 
-(function ($) {
+(function($) {
 
   $.extend(Alchemy, {
 
-    FileProgress:function (file) {
+    FileProgress: function(file) {
       var $progressBarContainer;
       this.fileID = file.id;
       this.$fileProgressWrapper = $('#' + this.fileID);
@@ -45,47 +45,57 @@ if (typeof(Alchemy) === 'undefined') {
 
   });
 
-  Alchemy.FileProgress.prototype.setTimer = function (timer) {
+  Alchemy.FileProgress.prototype.setTimer = function(timer) {
     this.$fileProgressElement["FP_TIMER"] = timer;
   };
 
-  Alchemy.FileProgress.prototype.getTimer = function (timer) {
+  Alchemy.FileProgress.prototype.getTimer = function(timer) {
     return this.$fileProgressElement["FP_TIMER"] || null;
   };
 
-  Alchemy.FileProgress.prototype.reset = function () {
+  Alchemy.FileProgress.prototype.reset = function() {
     this.$fileProgressStatus.html(" ");
     this.$progressBar.removeClass().addClass("progressBarInProgress");
-    this.$progressBar.css({width:'0%'});
+    this.$progressBar.css({
+      width: '0%'
+    });
   };
 
-  Alchemy.FileProgress.prototype.setProgress = function (percentage) {
+  Alchemy.FileProgress.prototype.setProgress = function(percentage) {
     this.$progressBar.removeClass().addClass("progressBarInProgress");
-    this.$progressBar.css({width:percentage + '%'});
+    this.$progressBar.css({
+      width: percentage + '%'
+    });
   };
 
-  Alchemy.FileProgress.prototype.setComplete = function () {
+  Alchemy.FileProgress.prototype.setComplete = function() {
     this.$progressBar.removeClass().addClass("progressBarComplete");
-    this.$progressBar.css({width:'100%'});
-    this.$fileProgressWrapper.delay(1500).fadeOut(function () {
+    this.$progressBar.css({
+      width: '100%'
+    });
+    this.$fileProgressWrapper.delay(1500).fadeOut(function() {
       $(this).remove();
     });
   };
 
-  Alchemy.FileProgress.prototype.setError = function () {
+  Alchemy.FileProgress.prototype.setError = function() {
     this.$progressBar.removeClass().addClass("progressBarError");
-    this.$progressBar.css({width:'100%'});
+    this.$progressBar.css({
+      width: '100%'
+    });
   };
 
-  Alchemy.FileProgress.prototype.setCancelled = function () {
+  Alchemy.FileProgress.prototype.setCancelled = function() {
     this.$progressBar.removeClass().addClass("progressBarCanceled");
-    this.$progressBar.css({width:'100%'});
-    this.$fileProgressWrapper.delay(1500).fadeOut(function () {
+    this.$progressBar.css({
+      width: '100%'
+    });
+    this.$fileProgressWrapper.delay(1500).fadeOut(function() {
       $(this).remove();
     });
   };
 
-  Alchemy.FileProgress.prototype.setStatus = function (status) {
+  Alchemy.FileProgress.prototype.setStatus = function(status) {
     this.$fileProgressStatus.text(status);
   };