scrivito_ui 1.6.0.rc2 → 1.6.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c1b67fb17597157b57649549f73a428537bbdd4
-  data.tar.gz: db7969d56febc4e1b98024e316600be56c0a6726
+  metadata.gz: 96d4ae87973c78fa558d664d06c608fe942fa2c2
+  data.tar.gz: 20f4cbbd4b725ea9fe24eb114f5b8ee645271162
 SHA512:
-  metadata.gz: 0302d7827ae390e1610d7502471fc0a2b82154d14997d34cc350c2b5617df16d6360fa8a01173e90e8ca32b744d0c8cc5f78d2ddcb49922b63e3ca5c2bb87044
-  data.tar.gz: 1f2dd06406bd7f627c0b21dfcb5d3f620634333a25826ce166ea344a1c01441fa08454663332b74c1261c11508cc8aa57542c1954da3119c93bfe9d1c70c7b31
+  metadata.gz: 1bfc6ce10feb6d0d4c9679eb4c22443dddd2a7f5214a4fc2e8c4e18009b248da4a5676d581c4064a34f1879541b5ce61e9a4ca476d868a17c2861e220cc26e23
+  data.tar.gz: 30e47b16dccb5fccace23aa6d289fb7494ba2372ed3b77b5ce45c7b470fb8f161081275f0a4f5eea7079631b895147820bcfd7da95bc513f371a2ae3acb60cd7

data/lib/assets/javascripts/scrivito_ui.js

@@ -38808,7 +38808,7 @@ window.scrivito = {}; // jshint ignore:line
     },
 
     root_path: function root_path() {
-      return scrivito.application_window.is_frame() ? '/scrivito/' : '/';
+      return scrivito.application_window.isFrame() ? '/scrivito/' : '/';
     },
 
     details_url_for_obj_id: function details_url_for_obj_id(id) {
@@ -38998,8 +38998,8 @@ window.scrivito = {}; // jshint ignore:line
 
       window.onbeforeunload = scrivito.warn_before_unloading;
 
-      scrivito.url_update(scrivito.application_window, scrivito.cms_window.from(window));
-      scrivito.application_window.use_fragment_of(scrivito.cms_window.from(window));
+      scrivito.urlUpdate(scrivito.application_window, scrivito.cmsWindow.from(window));
+      scrivito.application_window.useFragmentOf(scrivito.cmsWindow.from(window));
 
       inited = true;
     }
@@ -39619,7 +39619,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     },
 
     isFile: function isFile(obj) {
-      return this.isBlob(obj) && _.isDate(obj.lastModifiedDate) && _.isString(obj.name);
+      return this.isBlob(obj) && _.isString(obj.name);
     }
   };
 })();
@@ -47187,7 +47187,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
       new_document: function(document) {
         _.each(callbacks.document, function(callback) { callback(document); });
-        document.window().notify_new_document(document);
+        document.window().notifyNewDocument(document);
       },
 
       on: function(event_name, callback) {
@@ -48776,24 +48776,25 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr
 
   _.extend(scrivito.transition, {immediate_mode: false});
 }());
-(function() {
-  _.extend(scrivito, {
-    url_update: function(application_cms_window, ui_cms_window) {
-      if (application_cms_window === ui_cms_window) { return; }
-
-      application_cms_window.on('document', function(application_document) {
-        var ui_window = ui_cms_window.browser_window();
-        var application_window = application_document.browser_window();
-
-        var ui_url = ui_window.location.origin + '/scrivito' +
-          application_window.location.pathname +
-          application_window.location.search +
-          application_window.location.hash;
-        ui_window.history.replaceState({}, '', ui_url);
-      });
+'use strict';
+
+(function () {
+  function urlUpdate(applicationCmsWindow, uiCmsWindow) {
+    if (applicationCmsWindow === uiCmsWindow) {
+      return;
     }
-  });
-}());
+
+    applicationCmsWindow.on('document', function (applicationDocument) {
+      var uiWindow = uiCmsWindow.browserWindow();
+      var applicationWindow = applicationDocument.browser_window();
+
+      var uiURL = uiWindow.location.origin + '/scrivito' + applicationWindow.location.pathname + applicationWindow.location.search + applicationWindow.location.hash;
+      uiWindow.history.replaceState({}, '', uiURL);
+    });
+  }
+
+  scrivito.urlUpdate = urlUpdate;
+})();
 (function() {
   var permissions;
 
@@ -50192,7 +50193,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
       connect: function() {
         if (connect_initiated) { $.error("document connected twice!"); }
 
-        if (scrivito.cms_window.is_living_window(browser_window)) {
+        if (scrivito.cmsWindow.isLivingWindow(browser_window)) {
           connect_initiated = true;
           return that.preload_objs().then(function()  {
             _.each(load_callbacks, function(callback) {
@@ -50238,7 +50239,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
       },
 
       window: function() {
-        return scrivito.cms_window.from(browser_window);
+        return scrivito.cmsWindow.from(browser_window);
       },
 
       // return the given dom element using the local jQuery lib or the lib itself.
@@ -50574,141 +50575,155 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     }
   });
 }());
-(function() {
+'use strict';
 
-  scrivito.cms_window = {
-    from: function(element) {
-      if (!element) { $.error("no element given!"); }
+(function () {
+  var cmsWindow = {
+    from: function from(element) {
+      if (!element) {
+        $.error('no element given!');
+      }
 
-      var browser_window;
+      var browserWindow = undefined;
 
-      if (element.jquery && element[0].tagName === "IFRAME") {
+      if (element.jquery && element[0].tagName === 'IFRAME') {
         var doc = $(element).contents()[0];
-        browser_window = doc.defaultView;
-      }
-      else {
-        browser_window = element;
+        browserWindow = doc.defaultView;
+      } else {
+        browserWindow = element;
       }
 
-      if (!scrivito.cms_window.is_living_window(browser_window)) {
-        $.error("element is a closed browser window or " +
-            "not a window element at all");
+      if (!scrivito.cmsWindow.isLivingWindow(browserWindow)) {
+        $.error('element is a closed browser window or not a window element at all');
       }
 
-      var instance = find_instance(browser_window);
+      var instance = findInstance(browserWindow);
 
       if (!instance) {
-        instance = create_instance(browser_window);
-        store_instance(instance);
+        instance = createInstance(browserWindow);
+        storeInstance(instance);
       }
 
       return instance;
     },
 
-    is_living_window: function(maybe_window) {
-      if (!$.isWindow(maybe_window)) {
+    isLivingWindow: function isLivingWindow(maybeWindow) {
+      if (!$.isWindow(maybeWindow)) {
         return false;
       }
 
       // IE frees iframe resources once removed from the DOM
       // this way you can still test if the window is closed
-      if (maybe_window.parent === maybe_window.self) {
-        return maybe_window.self === top;
+      if (maybeWindow.parent === maybeWindow.self) {
+        return maybeWindow.self === top;
       }
-      return !maybe_window.closed;
+      return !maybeWindow.closed;
     },
 
     // For test purpose only.
-    instances: function() {
-      return instances;
+    instances: function instances() {
+      return _instances;
     }
   };
 
-  var instances = [];
-
-  var create_instance = function(browser_window) {
+  var _instances = [];
 
+  function createInstance(_browserWindow) {
     // PUBLIC
     var that = {
-      document: function() {
-        return scrivito.cms_element.from_dom_element($(browser_window.document));
+      document: function document() {
+        return scrivito.cms_element.from_dom_element($(_browserWindow.document));
       },
 
-      on: function(event, callback) {
-        if (event !== "document") { $.error("invalid event name: " + event); }
-        document_callbacks.push(callback);
+      on: function on(event, callback) {
+        if (event !== 'document') {
+          $.error('invalid event name: ' + event);
+        }
+        documentCallbacks.push(callback);
       },
 
-      notify_new_document: function(document) {
-        _.each(document_callbacks, function(callback) {
-          callback(document);
+      notifyNewDocument: function notifyNewDocument(document) {
+        _.each(documentCallbacks, function (callback) {
+          return callback(document);
         });
       },
 
-      browser_window: function() {
-        return browser_window;
+      browserWindow: function browserWindow() {
+        return _browserWindow;
       },
 
-      reload: function() {
-        return withSavingOverlay(scrivito.reload(browser_window));
+      reload: function reload() {
+        return withSavingOverlay(scrivito.reload(_browserWindow));
       },
 
-      redirect_to: function(location) {
-        return withSavingOverlay(scrivito.redirect_to(location, browser_window));
+      redirectTo: function redirectTo(location) {
+        return withSavingOverlay(scrivito.redirect_to(location, _browserWindow));
       },
 
-      use_fragment_of: function(other_cms_window) {
-        if (that === other_cms_window) { return; }
+      useFragmentOf: function useFragmentOf(otherCmsWindow) {
+        if (that === otherCmsWindow) {
+          return;
+        }
 
-        var ui_hash = other_cms_window.browser_window().location.hash;
-        if (ui_hash) {
-          var src_uri = new URI(that.iframe().src);
-          src_uri.fragment(ui_hash);
-          that.iframe().src = src_uri.href();
+        var uiHash = otherCmsWindow.browserWindow().location.hash;
+        if (uiHash) {
+          var srcUri = new URI(that.iframe().src);
+          srcUri.fragment(uiHash);
+          that.iframe().src = srcUri.href();
         }
       },
 
-      is_frame: function() {
-        return browser_window.parent !== browser_window;
+      isFrame: function isFrame() {
+        return _browserWindow.parent !== _browserWindow;
       },
 
-      iframe: _.once(function() {
-        return _.find($(browser_window.parent.document).find('iframe'), function(iframe) {
+      iframe: _.once(function () {
+        return _.find($(_browserWindow.parent.document).find('iframe'), function (iframe) {
           // Remove this try-catch after non-iframe mode has been disabled.
           try {
-            return $(iframe).contents()[0].defaultView === browser_window;
+            return $(iframe).contents()[0].defaultView === _browserWindow;
           } catch (e) {
             // Ignore cross-origin security errors.
           }
         });
-      })
-    };
+      }),
 
-    // PRIVATE
-    var document_callbacks = [];
+      fragment: function fragment() {
+        return _browserWindow.location.hash;
+      },
 
-    var withSavingOverlay = function(promise) {
-      promise = scrivito.withSavingOverlay(promise);
-      var my_frame = that.iframe();
-      if (my_frame) {
-        $(my_frame).one('load', function() { promise.resolve(); });
+      queryString: function queryString() {
+        return _browserWindow.location.search;
       }
-      return promise;
     };
 
+    // PRIVATE
+    var documentCallbacks = [];
+
+    function withSavingOverlay(promise) {
+      var newPromise = scrivito.withSavingOverlay(promise);
+      var myFrame = that.iframe();
+      if (myFrame) {
+        $(myFrame).one('load', function () {
+          return newPromise.resolve();
+        });
+      }
+      return newPromise;
+    }
+
     return that;
-  };
+  }
 
-  var cleanup_instances = function() {
+  function cleanupInstances() {
     // remove closed windows to allow the garbage collector to reap them
-    instances = _.reject(instances, function(instance) {
-      var win = instance.browser_window();
+    _instances = _.reject(_instances, function (instance) {
+      var win = instance.browserWindow();
       var closed = true;
 
       if (win) {
         try {
-          closed = !scrivito.cms_window.is_living_window(win);
-        } catch(e) {
+          closed = !scrivito.cmsWindow.isLivingWindow(win);
+        } catch (e) {
           // some browser prevent us from accessing closed windows
           // by throwing an error
         }
@@ -50716,21 +50731,22 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
       return closed;
     });
-  };
+  }
 
-  var find_instance = function(browser_window) {
-    cleanup_instances();
+  function findInstance(browserWindow) {
+    cleanupInstances();
 
-    return _.detect(instances, function(instance) {
-      return instance.browser_window() === browser_window;
+    return _.detect(_instances, function (instance) {
+      return instance.browserWindow() === browserWindow;
     });
-  };
+  }
 
-  var store_instance = function(instance) {
-    instances.push(instance);
-  };
+  function storeInstance(instance) {
+    _instances.push(instance);
+  }
 
-}());
+  scrivito.cmsWindow = cmsWindow;
+})();
 (function() {
   _.extend(scrivito, {
     date_field_element: {
@@ -52841,7 +52857,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
           return scrivito.withSavingOverlay(addSubpage);
         }).then(function (obj) {
-          return scrivito.application_window.redirect_to(scrivito.path_for_id(obj.id));
+          return scrivito.application_window.redirectTo(scrivito.path_for_id(obj.id));
         });
       }
     });
@@ -52970,7 +52986,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
   }
 
   function redirectToObj(objId) {
-    return scrivito.application_window.redirect_to(scrivito.path_for_id(objId));
+    return scrivito.application_window.redirectTo(scrivito.path_for_id(objId));
   }
 })();
 (function() {
@@ -53146,7 +53162,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
   }
 
   function redirectToPage(page) {
-    return scrivito.application_window.redirect_to(scrivito.path_for_id(page.id));
+    return scrivito.application_window.redirectTo(scrivito.path_for_id(page.id));
   }
 })();
 (function() {
@@ -53388,7 +53404,7 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr
   }
 
   function redirectToObj(objId) {
-    return scrivito.application_window.redirect_to(scrivito.path_for_id(objId));
+    return scrivito.application_window.redirectTo(scrivito.path_for_id(objId));
   }
 })();
 'use strict';
@@ -53499,42 +53515,48 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr
     }
   }
 })();
-(function() {
-  _.extend(scrivito, {
-    obj_details_command: function(obj) {
-      return scrivito.createCommand({
-        id: 'scrivito.sdk.obj_details',
-        title: function() {
-          if (scrivito.editingContext.isEditingMode()) {
-            return scrivito.t('commands.obj_details.title_edit');
-          } else {
-            return scrivito.t('commands.obj_details.title_view');
-          }
-        },
-        icon: '',
+'use strict';
 
-        present: function() {
-          return obj.has_details_view();
-        },
+(function () {
+  function objDetailsCommand(obj) {
+    return scrivito.createCommand({
+      id: 'scrivito.sdk.obj_details',
+      title: function title() {
+        if (scrivito.editingContext.isEditingMode()) {
+          return scrivito.t('commands.obj_details.title_edit');
+        }
 
-        execute: function() {
-          var title_locale;
-          if (scrivito.editingContext.isEditingMode()) {
-            title_locale = 'commands.obj_details.dialog.title_edit';
-          } else {
-            title_locale = 'commands.obj_details.dialog.title_view';
-          }
-          return scrivito.write_monitor.track_changes(function() {
-            return scrivito.details_dialog.open(obj.details_src(),
-              scrivito.t(title_locale, obj.description_for_editor()));
-          }, function() {
-            scrivito.application_window.redirect_to(scrivito.path_for_id(obj.id()));
-          });
+        return scrivito.t('commands.obj_details.title_view');
+      },
+      icon: '',
+
+      present: function present() {
+        return obj.has_details_view();
+      },
+
+      execute: function execute() {
+        var titleLocale = undefined;
+        if (scrivito.editingContext.isEditingMode()) {
+          titleLocale = 'commands.obj_details.dialog.title_edit';
+        } else {
+          titleLocale = 'commands.obj_details.dialog.title_view';
         }
-      });
-    }
-  });
-}());
+        return scrivito.write_monitor.track_changes(function () {
+          return scrivito.details_dialog.open(obj.details_src(), scrivito.t(titleLocale, obj.description_for_editor()));
+        }, function () {
+          var path = scrivito.path_for_id(obj.id());
+          var queryString = scrivito.application_window.queryString();
+          var fragment = scrivito.application_window.fragment();
+          var url = '' + path + queryString + fragment;
+
+          scrivito.application_window.redirectTo(url);
+        });
+      }
+    });
+  }
+
+  scrivito.obj_details_command = objDetailsCommand;
+})();
 'use strict';
 
 (function () {
@@ -53756,7 +53778,7 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr
           }).then(function() {
             return scrivito.withSavingOverlay(obj.revert()).then(function() {
               scrivito.application_window.reload();
-              scrivito.cms_window.from($('iframe[name=scrivito_details_dialog]')).reload();
+              scrivito.cmsWindow.from($('iframe[name=scrivito_details_dialog]')).reload();
             });
           });
         }
@@ -54522,12 +54544,16 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr
     menu.appendTo($('#scrivito_editing'));
     menu.update_position(); // Bugfix IE: can't set offset before append.
 
-    var viewport = $(scrivito.application_window.browser_window());
+    var $iframeWrapper = $('.iframe_wrapper');
+    var absElementLeft = domElement.offset().left - $iframeWrapper.scrollLeft();
+    var visibleSpaceRight = $iframeWrapper.width() - absElementLeft;
 
-    if (domElement.offset().left + box.width() > viewport.scrollLeft() + viewport.width()) {
+    if (visibleSpaceRight < box.width()) {
       box.addClass('scrivito_left');
     }
 
+    var viewport = $(scrivito.application_window.browserWindow());
+
     var scrivitoMenuBoxTop = 25; // value of css class ".scrivito_menu_box.top"
     var boxHeight = box.height() + scrivitoMenuBoxTop;
     var visibleSpaceAbove = domElement.offset().top - viewport.scrollTop();
@@ -59314,13 +59340,13 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr
 (function() {
   $(function() {
     var iframe = $('iframe[name=scrivito_application]');
-    scrivito.application_window = scrivito.cms_window.from(iframe);
+    scrivito.application_window = scrivito.cmsWindow.from(iframe);
 
     // Fallback behavior in case that application window renders a page with no SDK, e.g. an error
     // or a static page.
     iframe.on('load', function() {
       var application_document = scrivito.application_document();
-      var browser_window = scrivito.application_window.browser_window();
+      var browser_window = scrivito.application_window.browserWindow();
 
       var has_config = !!application_document.page_config();
       var has_sdk = !!browser_window.scrivito;