diff --git a/controllets/create-card-controllet/create-card-controllet.html b/controllets/create-card-controllet/create-card-controllet.html index ebfa895..83caacb 100755 --- a/controllets/create-card-controllet/create-card-controllet.html +++ b/controllets/create-card-controllet/create-card-controllet.html @@ -50,7 +50,14 @@ } p { - margin: 16px 8px 0px 8px; + padding: 16px 0px 0px 8px; + margin: 0px; + } + + #create_card_text { + width: 100%; + height: 100%; + background-color: #FFFFCC; } #create_card_title { @@ -62,11 +69,6 @@ #create_card_description { font-style: italic; color: #727272; - text-align: center; - } - - #create_card_text { - } paper-input, paper-textarea { @@ -138,6 +140,7 @@ +
PREVIEW
@@ -204,49 +162,54 @@ Polymer({ is: "paper-card-controllet", properties: { + width: { type: Number, observer: "_changeWidth" }, + height: { type: Number, observer: "_changeHeight" }, + + elevation:{ + type: Number, + value: 3 + }, + cardType:{ type: String, value: "text" }, - comment:{ - cardType: String, - value: "" - }, + cardTitle:{ type: String, value: "" }, - elevation:{ - type: Number, - value: 3 + + comment:{//cardDescription + cardType: String, + value: "" } }, attached: function(){ if(this.cardType == "text"){ - this.$.content.style.backgroundColor = "#ffc"; + this.$.content.style.backgroundColor = "#FFFFCC"; } + $(this.$.fullscreen_container).perfectScrollbar(); }, - _changeWidth: function(data){ - this.style.width = data + "px"; - //this.$.content.style.width = data + "px"; - //$(this.$.content).perfectScrollbar(); + _changeWidth: function(){ + this.style.width = this.width + "px"; + this.$.content.style.width = this.width - 8 + "px"; }, - _changeHeight: function(data){ - this.style.height = (data) + "px"; - this.$.content.style.height = data + "px"; - this.style.height = (this.height + ((this.text != "") ? 50 : 0)) + "px"; + _changeHeight: function(){ + this.style.height = this.height + 64 + "px"; + this.$.content.style.height = this.height - 4 + "px"; $(this.$.content).perfectScrollbar(); }, @@ -254,40 +217,32 @@ return (type == check); }, - _handleDetailsClick: function(e){ - this.fire('paper-card-controllet_details-clicked', {data : this}); - }, - - _handleDeleteClick: function(e){ + _handleDeleteClick: function(){ this.fire('paper-card-controllet_delete-clicked', {data : this}); }, - _handleFullscreenClick: function(e){ + _handleModifyClick: function(){ + this.fire('paper-card-controllet_details-clicked', {data : this}); + }, + _handleOpenClick: function(){ + var html; switch(this.cardType){ case 'text': - this.$.fullscreen_content.style.backgroundColor = "#ffc"; + this.$.fullscreen_container.style.backgroundColor = "#ffc"; break; case 'link': - window.open(this.getAttribute('card-link'),'_blank'); + window.open(this.getAttribute('card-link'), '_blank'); return; } var html = this.$.content.innerHTML; - this.$.content.innerHTML = ""; this.$.fullscreen_content.innerHTML = html; - this.$.fullscreen_container.style.display = "inline-block"; - }, - - _handleCloseFullscreenClick: function(e){ - - var html = this.$.fullscreen_content.innerHTML; - this.$.fullscreen_content.innerHTML = ""; - this.$.content.innerHTML = html; - - this.$.fullscreen_container.style.display = "none"; + this.$.fullscreen_container.open(); + this.$.fullscreen_container.style.display = "inline";//datalet resize in chrome } + }) diff --git a/controllets/paper-card-controllet/paper-card-controllet_old.html b/controllets/paper-card-controllet/paper-card-controllet_old.html new file mode 100755 index 0000000..05c7022 --- /dev/null +++ b/controllets/paper-card-controllet/paper-card-controllet_old.html @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/datalets/base-datalet/base-datalet.html b/datalets/base-datalet/base-datalet.html index c6ff64c..85f9c4b 100755 --- a/datalets/base-datalet/base-datalet.html +++ b/datalets/base-datalet/base-datalet.html @@ -169,6 +169,11 @@ Example : }); } } + + else { + this.hideFooter(); + this.$.base_datalet_spin.remove(); + } }, attached: function(){ diff --git a/datalets/preview-datalet/preview-datalet.html b/datalets/preview-datalet/preview-datalet.html index d713563..598a173 100755 --- a/datalets/preview-datalet/preview-datalet.html +++ b/datalets/preview-datalet/preview-datalet.html @@ -47,55 +47,49 @@ Example: --> + @@ -103,35 +97,8 @@ Example: Polymer({ is : 'preview-datalet', - - properties: { - /** - * It's the url for the preview - * - * @attribute url - * @type Strig - * @default '' - */ - url : { - type : String, - value : "" - } - }, - - /** - * It is called after the element’s template has been stamped and all elements inside the element’s local - * DOM have been configured (with values bound from parents, deserialized attributes, or else default values) - * and had their ready method called. - * - * Extract the dataset domain from the entire URL and set the text content of the datalet footer. - * - * @method ready - * - */ - ready: function(){ - //this.$.base.setDomain(this.url.split("/")[0] + "//" + this.url.split("/")[2]); - } }); + diff --git a/datalets/preview-datalet/preview-datalet_old.html b/datalets/preview-datalet/preview-datalet_old.html new file mode 100755 index 0000000..d713563 --- /dev/null +++ b/datalets/preview-datalet/preview-datalet_old.html @@ -0,0 +1,137 @@ + + + + + + + + + + + + + +