From 108f01021eb3968088915de301b4fddf24d638a7 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Mon, 28 Nov 2016 20:24:01 +0300 Subject: [PATCH] more refactoring... Signed-off-by: Alex A. Naanou --- ui (gen4)/features/base.js | 8 ++++++++ ui (gen4)/features/core.js | 9 --------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ui (gen4)/features/base.js b/ui (gen4)/features/base.js index 5240bf3b..0343568c 100755 --- a/ui (gen4)/features/base.js +++ b/ui (gen4)/features/base.js @@ -97,6 +97,14 @@ actions.Actions({ // so to avoid recursion do not use these in the specific // actions... + // Data... + get data(){ + var d = this.__data = this.__data || data.Data() + return d + }, + set data(value){ + this.__data = value }, + // Base ribbon... get base(){ return this.data.base diff --git a/ui (gen4)/features/core.js b/ui (gen4)/features/core.js index 274ab2b3..b6ebc704 100755 --- a/ui (gen4)/features/core.js +++ b/ui (gen4)/features/core.js @@ -18,8 +18,6 @@ var actions = require('lib/actions') var features = require('lib/features') var toggler = require('lib/toggler') -var data = require('imagegrid/data') - /*********************************************************************/ @@ -82,13 +80,6 @@ function(attr, states, a, b){ // var ImageGridMetaActions = module.ImageGridMetaActions = { - // XXX experimental... - get data(){ - var d = this.__data = this.__data || data.Data() - return d - }, - set data(value){ this.__data = value }, - // Test if the action is a Toggler... // isToggler: actions.doWithRootAction(function(action){